From 443c9e9d00b1dae496baa9657376b9162107be50 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 19 七月 2022 15:54:28 +0800
Subject: [PATCH] 优化多个相同角色数据导致权限SQL重复问题
---
src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 1fb98dc..d0c9084 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -1,5 +1,7 @@
package com.ruoyi.framework.aspectj;
+import java.util.ArrayList;
+import java.util.List;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -79,15 +81,21 @@
*
* @param joinPoint 鍒囩偣
* @param user 鐢ㄦ埛
- * @param userAlias 鍒悕
+ * @param deptAlias 閮ㄩ棬鍒悕
+ * @param userAlias 鐢ㄦ埛鍒悕
*/
public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
{
StringBuilder sqlString = new StringBuilder();
+ List<String> conditions = new ArrayList<String>();
for (SysRole role : user.getRoles())
{
String dataScope = role.getDataScope();
+ if (conditions.contains(dataScope))
+ {
+ continue;
+ }
if (DATA_SCOPE_ALL.equals(dataScope))
{
sqlString = new StringBuilder();
@@ -121,6 +129,7 @@
sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
}
}
+ conditions.add(dataScope);
}
if (StringUtils.isNotBlank(sqlString.toString()))
--
Gitblit v1.9.3