From 0c3f0f3e387fa66e520d8a065011232b559e6acc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 13:43:43 +0800
Subject: [PATCH] fix(datascope): 修复数据权限范围判断逻辑
---
src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 2cf52c3..065a17c 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -107,7 +107,10 @@
{
continue;
}
- if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+ // 鏃犳潈闄愬瓧绗︿笂涓嬫枃(permission 涓虹┖锛屽鍛樺伐鍒犻櫎杩欑被鏃燖PreAuthorize鐨勬帴鍙�)鏃讹紝
+ // 涓嶅仛鍩轰簬鏉冮檺瀛楃鐨勯杩囨护锛屽惁鍒�"鍏ㄩ儴鏁版嵁"瑙掕壊浼氬湪鍛戒腑 DATA_SCOPE_ALL 鍓嶈 continue锛�
+ // 鏈�缁堣惤鍏�"鏃犱换浣曡鑹插尮閰�"鐨勫厹搴曪紝瀵艰嚧鏃犳硶鍒犻櫎
+ if (StringUtils.isNotBlank(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
{
continue;
}
@@ -139,10 +142,14 @@
{
sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
}
- else
+ else if (StringUtils.isNotBlank(deptAlias))
{
// 鏁版嵁鏉冮檺涓轰粎鏈汉涓旀病鏈塽serAlias鍒悕涓嶆煡璇换浣曟暟鎹�
- sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+ sqlString.append(StringUtils.format(" OR {}.dept_id = -1 ", deptAlias));
+ }
+ else
+ {
+ sqlString.append(" OR 1 = 0 ");
}
}
conditions.add(dataScope);
@@ -151,7 +158,18 @@
// 瑙掕壊閮戒笉鍖呭惈浼犻�掕繃鏉ョ殑鏉冮檺瀛楃锛岃繖涓椂鍊檚qlString涔熶細涓虹┖锛屾墍浠ヨ闄愬埗涓�涓�,涓嶆煡璇换浣曟暟鎹�
if (StringUtils.isEmpty(conditions))
{
- sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+ if (StringUtils.isNotBlank(deptAlias))
+ {
+ sqlString.append(StringUtils.format(" OR {}.dept_id = -1 ", deptAlias));
+ }
+ else if (StringUtils.isNotBlank(userAlias))
+ {
+ sqlString.append(StringUtils.format(" OR {}.user_id = -1 ", userAlias));
+ }
+ else
+ {
+ sqlString.append(" OR 1 = 0 ");
+ }
}
if (StringUtils.isNotBlank(sqlString.toString()))
--
Gitblit v1.9.3