fix: 修复角色数据权限分配中的注释代码问题并添加数据范围注解
- 在DataScopeAspect中修复角色数据权限分配的逻辑 - 在ProjectOrderInfoServiceImpl中添加@DataScope注解以限制导出和列表数据范围dev_1.0.2
parent
48bad8a9a6
commit
4cc420799e
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<Map<String, Object>> listExportData(ProjectOrderInfo projectOrderInfo) {
|
||||
List<ProjectOrderInfo> projectInfos = this.selectProjectOrderInfoList(projectOrderInfo);
|
||||
if (CollUtil.isEmpty(projectInfos)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue