diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java index b24fa66b..d6a454b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java @@ -61,12 +61,12 @@ public class SysPermissionServiceImpl implements ISysPermissionService { Set perms = new HashSet(); // 管理员拥有所有权限 - if (roleService.checkIsAdmin(user.getUserId())) - { - perms.add("*:*:*"); - } - else - { +// if (roleService.checkIsAdmin(user.getUserId())) +// { +// perms.add("*:*:*"); +// } +// else +// { List roles = user.getRoles(); if (!CollectionUtils.isEmpty(roles)) { @@ -82,7 +82,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService { perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); } - } +// } return perms; } }