From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/RoleController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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..93c2c75 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;
 
 /**
  * 角色控制器
@@ -110,6 +111,14 @@
     @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 +136,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