From bb6f79913b8a58a77c1cf43c0610bc94957e5f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=B8=80=E6=A3=AE?= <liuyisen@paixuetang.email>
Date: Thu, 9 Nov 2023 16:36:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E5=8F=8A=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/common/core/constant/UserConstants.java  |  5 -----
 .../common/sensitive/annotation/Sensitive.java       |  4 ++--
 .../common/sensitive/core/SensitiveService.java      |  2 +-
 .../system/service/impl/SysSensitiveServiceImpl.java | 12 ++----------
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
index 951b8371d..6f3b0b96b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
@@ -139,9 +139,4 @@ public interface UserConstants {
      */
     Long SUPER_ADMIN_ID = 1L;
 
-    /**
-     * 角色及菜单权限脱敏标识
-     */
-    String SENSITIVE = "sensitive";
-
 }
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
index 2648a52eb..f78aac6c9 100644
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Target;
 public @interface Sensitive {
     SensitiveStrategy strategy();
 
-    String roleKey() default UserConstants.SENSITIVE;
+    String roleKey() default "";
 
-    String perms() default UserConstants.SENSITIVE;
+    String perms() default "";
 }
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
index 9571745c7..7b5264b87 100644
--- a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
@@ -13,6 +13,6 @@ public interface SensitiveService {
     /**
      * 是否脱敏
      */
-    boolean isSensitive(String roleKey,String perms);
+    boolean isSensitive(String roleKey, String perms);
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java
index 38b5454cf..a34aff8c6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java
@@ -27,16 +27,8 @@ public class SysSensitiveServiceImpl implements SensitiveService {
         if (!StpUtil.isLogin()){
             return true;
         }
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        if (ObjectUtil.isNotNull(loginUser)) {
-            boolean roleSensitiveFlag = loginUser.getRolePermission().stream().anyMatch(role -> role.contains(roleKey));
-            if (roleSensitiveFlag) {
-                return false;
-            }
-            boolean permsSensitiveFlag = loginUser.getMenuPermission().stream().anyMatch(menu -> menu.contains(perms));
-            if (permsSensitiveFlag) {
-                return false;
-            }
+        if (StpUtil.hasRole(roleKey) || StpUtil.hasPermission(perms)){
+            return false;
         }
         if (TenantHelper.isEnable()) {
             return !LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin();