瀏覽代碼

问题处理

yzc 1 年之前
父節點
當前提交
58411e9c6d

+ 0 - 3
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseIdPo.java

@@ -16,7 +16,4 @@ public class BaseIdPo implements Serializable {
 
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
-
-    @TableField(exist = false)
-    private Long cId;
 }

+ 7 - 1
ruoyi-system/src/main/java/com/ruoyi/system/utils/UserUtil.java

@@ -124,13 +124,19 @@ public class UserUtil {
         if (count >= 100) {
             throw new ServiceException("查询角色子级循环超过" + count + "次,可能成环,请检查或联系管理员!");
         }
+
+        List<SysRole> temp = new ArrayList<>();
+
         for (SysRole userRole : userRoles) {
             List<SysRole> list = roleService.list(IWrapper.<SysRole>getWrapper().eq(SysRole::getParentId, userRole.getRoleId()));
             if (ObjectUtil.isEmpty(list)) {
                 continue;
             }
-            userRoles.addAll(recursionRoles(list, count));
+
+            List<SysRole> roles = recursionRoles(list, count);
+            temp.addAll(roles);
         }
+        userRoles.addAll(temp);
         return userRoles;
     }