From 80d25863db80001427f796a13d37d2d06135c1d0 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 25 七月 2022 18:32:42 +0800
Subject: [PATCH] !536 防止主键字段名与'row'或'ids'一致导致报错的问题。 Merge pull request !536 from 张政/N/A
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index ff84bcd..5b0215c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/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.2