Commit 3807b11290794b985aeda4d166a41031788e0874
1 parent
c9f25cb3
权限调整
Showing
1 changed file
with
2 additions
and
2 deletions
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
| @@ -109,7 +109,7 @@ public class PermissionService | @@ -109,7 +109,7 @@ public class PermissionService | ||
| 109 | for (SysRole sysRole : loginUser.getUser().getRoles()) | 109 | for (SysRole sysRole : loginUser.getUser().getRoles()) |
| 110 | { | 110 | { |
| 111 | String roleKey = sysRole.getRoleKey(); | 111 | String roleKey = sysRole.getRoleKey(); |
| 112 | - if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(StringUtils.trim(role))) | 112 | + if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) |
| 113 | { | 113 | { |
| 114 | return true; | 114 | return true; |
| 115 | } | 115 | } |
| @@ -164,6 +164,6 @@ public class PermissionService | @@ -164,6 +164,6 @@ public class PermissionService | ||
| 164 | */ | 164 | */ |
| 165 | private boolean hasPermissions(Set<String> permissions, String permission) | 165 | private boolean hasPermissions(Set<String> permissions, String permission) |
| 166 | { | 166 | { |
| 167 | - return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission)); | 167 | + return permissions.contains(ALL_PERMISSION) || permissions.equals(StringUtils.trim(permission)); |
| 168 | } | 168 | } |
| 169 | } | 169 | } |