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 | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 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 a532422..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"; } @@ -110,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)); } @@ -127,6 +135,7 @@ role.setId(null); role.setObjType(UserExt.getUser().getObjectType()); role.setObjId(UserExt.getUser().getObjectId()); + role.setVersion(UserExt.getUser().getId()); this.roleService.save(role); -- Gitblit v1.7.1