ToolTech/tool-tech
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、发布工具权限逻辑调整

Browse Source
This commit is contained in:
pan
2024-09-02 17:14:52 +08:00
parent ca62286f98
commit 242fa6736e
8 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tool-tech-framework/src/main/java/com/rzdata/framework/aspectj/DataScopeAspect.java
View File

@@ -131,7 +131,12 @@ public class DataScopeAspect
}
else if (DATA_SCOPE_DEPT.equals(dataScope))
{
sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
if (StringUtils.isNotBlank(userAlias))
{
sqlString.append(StringUtils.format(" OR {}.dept_id = {} Or {}.user_id = {}", deptAlias, user.getDeptId() , userAlias, user.getUserId()));
}else{
sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
}
}
else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
{