mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复角色数据权限分配中的注释代码问题并添加数据范围注解 

- 在DataScopeAspect中修复角色数据权限分配的逻辑
- 在ProjectOrderInfoServiceImpl中添加@DataScope注解以限制导出和列表数据范围
dev_1.0.2
chenhao 2026-03-20 13:52:27 +08:00
parent 48bad8a9a6
commit 4cc420799e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
View File

@ -105,7 +105,7 @@ public class DataScopeAspect
{ {
continue; continue;
} }
if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)) )
{ {
continue; continue;
} }

2
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
View File

@ -537,6 +537,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
} }
@Override @Override
@DataScope(deptAlias = "t5", userAlias = "t5")
public String exportList(ProjectOrderInfo projectOrderInfo) { public String exportList(ProjectOrderInfo projectOrderInfo) {
try { try {
// 获取项目信息列表 // 获取项目信息列表
@ -562,6 +563,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
} }
@Override @Override
@DataScope(deptAlias = "t5", userAlias = "t5")
public List<Map<String, Object>> listExportData(ProjectOrderInfo projectOrderInfo) { public List<Map<String, Object>> listExportData(ProjectOrderInfo projectOrderInfo) {
List<ProjectOrderInfo> projectInfos = this.selectProjectOrderInfoList(projectOrderInfo); List<ProjectOrderInfo> projectInfos = this.selectProjectOrderInfoList(projectOrderInfo);
if (CollUtil.isEmpty(projectInfos)) { if (CollUtil.isEmpty(projectInfos)) {