需求

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -111,7 +111,16 @@ public class ToUserServerImpl implements IToUserService {
             parentIdList.add(e.get("parent_id").toString());
         });
         List<Map<String,Object>> parentPermissionList = toUserMapper.selectByPermissionList(parentIdList);
-        permissionList.addAll(parentPermissionList);
+        //构造权限
+        List<Map<String,Object>> allList = new ArrayList<>();
+        permissionList.stream().forEach(e -> {
+            allList.add(e);
+            parentPermissionList.stream().forEach(m -> {
+                if (!e.get("id").equals(m.get("id"))){
+                    allList.add(m);
+                }
+            });
+        });
         return permissionList;
     }
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -370,7 +370,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             parentIdList.add(e.get("parent_id").toString());
         });
         List<Map<String,Object>> parentPermissionList = userMapper.selectByPermissionList(parentIdList);
-        permissionList.addAll(parentPermissionList);
+        //构造权限
+        List<Map<String,Object>> allList = new ArrayList<>();
+        permissionList.stream().forEach(e -> {
+            allList.add(e);
+            parentPermissionList.stream().forEach(m -> {
+                if (!e.get("id").equals(m.get("id"))){
+                    allList.add(m);
+                }
+            });
+        });
+        
         return permissionList;
     }