From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 5f4d121..8a0d45e 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,7 @@
package org.dromara.system.service.impl;
import cn.dev33.satoken.stp.StpUtil;
-import org.dromara.common.core.utils.StringUtils;
+import cn.hutool.core.util.ArrayUtil;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.sensitive.core.SensitiveService;
import org.dromara.common.tenant.helper.TenantHelper;
@@ -22,19 +22,19 @@
* 鏄惁鑴辨晱
*/
@Override
- public boolean isSensitive(String roleKey, String perms) {
+ public boolean isSensitive(String[] roleKey, String[] perms) {
if (!LoginHelper.isLogin()) {
return true;
}
- boolean roleExist = StringUtils.isNotBlank(roleKey);
- boolean permsExist = StringUtils.isNotBlank(perms);
+ boolean roleExist = ArrayUtil.isNotEmpty(roleKey);
+ boolean permsExist = ArrayUtil.isNotEmpty(perms);
if (roleExist && permsExist) {
- if (StpUtil.hasRole(roleKey) && StpUtil.hasPermission(perms)) {
+ if (StpUtil.hasRoleOr(roleKey) && StpUtil.hasPermissionOr(perms)) {
return false;
}
- } else if (roleExist && StpUtil.hasRole(roleKey)) {
+ } else if (roleExist && StpUtil.hasRoleOr(roleKey)) {
return false;
- } else if (permsExist && StpUtil.hasPermission(perms)) {
+ } else if (permsExist && StpUtil.hasPermissionOr(perms)) {
return false;
}
--
Gitblit v1.9.3