From 4ca30f08d64de84479b3b510bc8153550f99d1f3 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 10 十一月 2023 15:46:27 +0800
Subject: [PATCH] 修改权限字符匹配方式
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index f88f8a1..3898cfa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -20,6 +20,7 @@
*/
public class SecurityUtils
{
+
/**
* 用户ID
**/
@@ -49,7 +50,7 @@
throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED);
}
}
-
+
/**
* 获取用户账户
**/
@@ -145,7 +146,7 @@
public static boolean hasPermi(Collection<String> authorities, String permission)
{
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 static boolean hasRole(Collection<String> roles, String role)
{
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));
}
}
--
Gitblit v1.9.2