From df4733091b30b0434a04dacd0e844663114d4cfe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 09 七月 2025 17:51:56 +0800
Subject: [PATCH] 修改支付宝支付和bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
index eb76c12..a175b59 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 角色控制器
@@ -83,7 +84,7 @@
model.addAttribute("pName", ConstantFactory.me().getSingleRoleName(role.getPid()));
model.addAttribute("deptName", ConstantFactory.me().getDeptName(role.getDeptid()));
LogObjectHolder.me().set(role);
- model.addAttribute("language",UserExt.getLanguage());
+ model.addAttribute("language",1);
return PREFIX + "/role_edit.html";
}
@@ -96,8 +97,9 @@
if (Objects.isNull(roleId)) {
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
+ Role role = roleService.getById(roleId);
model.addAttribute("roleId", roleId);
- model.addAttribute("roleName", ConstantFactory.me().getSingleRoleName(roleId));
+ model.addAttribute("roleName", role.getName());
return PREFIX + "/role_assign.html";
}
@@ -109,6 +111,13 @@
@ResponseBody
public Object list(@RequestParam(required = false) String roleName) {
List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"));
+ //运营商
+ if (UserExt.getUser().getObjectType()==2){
+ List<Map<String, Object>> filteredRoles = roles.stream()
+ .filter(role -> role.containsKey("version") && role.get("version").equals(UserExt.getUser().getId()))
+ .collect(Collectors.toList());
+ return super.warpObject(new RoleWarpper(filteredRoles));
+ }
return super.warpObject(new RoleWarpper(roles));
}
@@ -124,6 +133,9 @@
throw new GunsException(BizExceptionEnum.REQUEST_NULL);
}
role.setId(null);
+ role.setObjType(UserExt.getUser().getObjectType());
+ role.setObjId(UserExt.getUser().getObjectId());
+ role.setVersion(UserExt.getUser().getId());
this.roleService.save(role);
@@ -215,7 +227,7 @@
@RequestMapping(value = "/roleTreeList")
@ResponseBody
public List<ZTreeNode> roleTreeList() {
- List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(UserExt.getUser().getObjectType(),UserExt.getUser().getObjectId());
roleTreeList.add(ZTreeNode.createParent());
return roleTreeList;
}
@@ -228,12 +240,14 @@
public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) {
User theUser = this.userService.getById(userId);
String roleid = theUser.getRoleid();
+ Integer objectType = UserExt.getUser().getObjectType();
+ Integer objectId = UserExt.getUser().getObjectId();
if (Objects.isNull(roleid)) {
- List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList(objectType,objectId);
return roleTreeList;
} else {
String[] strArray = Convert.toStrArray(",", roleid);
- List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray);
+ List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray,objectType,objectId);
return roleTreeListByUserId;
}
}
--
Gitblit v1.7.1