优化用户

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -113,11 +113,11 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public List<SysMenu> selectMenuTreeByUserId(Long userId) {
         List<SysMenu> menus;
-        if (sysRoleService.checkIsAdmin()) {
-            menus = menuMapper.selectMenuTreeAll();
-        } else {
+//        if (sysRoleService.checkIsAdmin()) {
+//            menus = menuMapper.selectMenuTreeAll();
+//        } else {
             menus = menuMapper.selectMenuTreeByUserId(userId);
-        }
+//        }
         return getChildPerms(menus, 0);
     }
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -61,12 +61,12 @@ public class SysPermissionServiceImpl implements ISysPermissionService
     {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
-//        if (roleService.checkIsAdmin(user.getUserId()))
-//        {
-//            perms.add("*:*:*");
-//        }
-//        else
-//        {
+        if (roleService.checkIsAdmin(user.getUserId()))
+        {
+            perms.add("*:*:*");
+        }
+        else
+        {
             List<SysRole> roles = user.getRoles();
             if (!CollectionUtils.isEmpty(roles))
             {
@@ -82,7 +82,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService
             {
                 perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
             }
-//        }
+        }
         return perms;
     }
 }