优化多个相同角色数据导致权限SQL重复问题

This commit is contained in:
RuoYi 2022-07-19 15:54:45 +08:00
parent d4c4d59464
commit e613f00400

View File

@ -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;
@ -76,7 +78,7 @@ public class DataScopeAspect
/**
* 数据范围过滤
*
*
* @param joinPoint 切点
* @param user 用户
* @param deptAlias 部门别名
@ -85,10 +87,15 @@ public class DataScopeAspect
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();
@ -122,6 +129,7 @@ public class DataScopeAspect
sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
}
}
conditions.add(dataScope);
}
if (StringUtils.isNotBlank(sqlString.toString()))