From a619d2de512972684baa0e7ba61ef25f106736d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=80=E6=A3=AE?= Date: Thu, 9 Nov 2023 17:14:10 +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 --- .../service/impl/SysSensitiveServiceImpl.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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 00e14b8e7..ab18437e6 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 @@ -26,19 +26,16 @@ public class SysSensitiveServiceImpl implements SensitiveService { if (!StpUtil.isLogin()){ return true; } - - if (StringUtils.isNotEmpty(roleKey) && StringUtils.isNotEmpty(perms)){ + boolean roleExist = StringUtils.isNotEmpty(roleKey); + boolean permsExist = StringUtils.isNotEmpty(perms); + if (roleExist && permsExist){ if (StpUtil.hasRole(roleKey) && StpUtil.hasPermission(perms)){ return false; } - }else if (StringUtils.isNotEmpty(roleKey)){ - if (StpUtil.hasRole(roleKey)){ - return false; - } - }else if (StringUtils.isNotEmpty(perms)){ - if (StpUtil.hasPermission(perms)){ - return false; - } + }else if (roleExist && StpUtil.hasRole(roleKey)){ + return false; + }else if (permsExist && StpUtil.hasPermission(perms)){ + return false; } if (TenantHelper.isEnable()) {