songwei
/
fxfast-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改权限字符匹配方式

This commit is contained in:
RuoYi 2023-11-10 15:46:27 +08:00
parent 73f881c7d3
commit 4ca30f08d6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
View File

@ -20,6 +20,7 @@ import com.ruoyi.common.exception.ServiceException;
*/ */
public class SecurityUtils public class SecurityUtils
{ {
/** /**
* 用户ID * 用户ID
**/ **/
@ -49,7 +50,7 @@ public class SecurityUtils
throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED); throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED);
} }
} }
/** /**
* 获取用户账户 * 获取用户账户
**/ **/
@ -145,7 +146,7 @@ public class SecurityUtils
public static boolean hasPermi(Collection<String> authorities, String permission) public static boolean hasPermi(Collection<String> authorities, String permission)
{ {
return authorities.stream().filter(StringUtils::hasText) return authorities.stream().filter(StringUtils::hasText)
.anyMatch(x -> Constants.ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(x, permission)); .anyMatch(x -> Constants.ALL_PERMISSION.equals(x) || PatternMatchUtils.simpleMatch(x, permission));
} }
/** /**
@ -171,7 +172,7 @@ public class SecurityUtils
public static boolean hasRole(Collection<String> roles, String role) public static boolean hasRole(Collection<String> roles, String role)
{ {
return roles.stream().filter(StringUtils::hasText) return roles.stream().filter(StringUtils::hasText)
.anyMatch(x -> Constants.SUPER_ADMIN.contains(x) || PatternMatchUtils.simpleMatch(x, role)); .anyMatch(x -> Constants.SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role));
} }
} }