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 77db4d73..a0b77180 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 @@ -105,7 +105,7 @@ public class DataScopeAspect { continue; } - if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)) ) { continue; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index d18a49c0..a43aee65 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -537,6 +537,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To } @Override + @DataScope(deptAlias = "t5", userAlias = "t5") public String exportList(ProjectOrderInfo projectOrderInfo) { try { // 获取项目信息列表 @@ -562,6 +563,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To } @Override + @DataScope(deptAlias = "t5", userAlias = "t5") public List> listExportData(ProjectOrderInfo projectOrderInfo) { List projectInfos = this.selectProjectOrderInfoList(projectOrderInfo); if (CollUtil.isEmpty(projectInfos)) {