From 3d9b05a61afc677d4ede1f876a94281a7a017af1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 09 十一月 2023 17:49:11 +0800
Subject: [PATCH] fix 修复 !pr444 代码判断错误
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 296574b..05eb430 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
@@ -1,7 +1,10 @@
package org.dromara.system.service.impl;
+import cn.dev33.satoken.stp.StpUtil;
+import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.sensitive.core.SensitiveService;
+import org.dromara.common.tenant.helper.TenantHelper;
import org.springframework.stereotype.Service;
/**
@@ -19,8 +22,26 @@
* 鏄惁鑴辨晱
*/
@Override
- public boolean isSensitive() {
- return !LoginHelper.isSuperAdmin() || !LoginHelper.isTenantAdmin();
+ public boolean isSensitive(String roleKey, String perms) {
+ if (!StpUtil.isLogin()) {
+ return true;
+ }
+ boolean roleExist = StringUtils.isNotBlank(roleKey);
+ boolean permsExist = StringUtils.isNotBlank(perms);
+ if (roleExist && permsExist) {
+ if (StpUtil.hasRole(roleKey) && StpUtil.hasPermission(perms)) {
+ return false;
+ }
+ } else if (roleExist && StpUtil.hasRole(roleKey)) {
+ return false;
+ } else if (permsExist && StpUtil.hasPermission(perms)) {
+ return false;
+ }
+
+ if (TenantHelper.isEnable()) {
+ return !LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin();
+ }
+ return !LoginHelper.isSuperAdmin();
}
}
--
Gitblit v1.9.3