ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 企标列表权限判断报错

Browse Source
This commit is contained in:
mzaxd
2023-11-01 16:24:06 +08:00
parent 1bd243aa96
commit 8abf6327be
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java
+4 -2
View File
@@ -93,6 +93,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
String userId = currentUser.getId(); String userId = currentUser.getId();
String deptId = currentUser.getDepartIds(); String deptId = currentUser.getDepartIds();
SysDepart dept = sysDepartService.getById(deptId); SysDepart dept = sysDepartService.getById(deptId);
String curDeptName = dept == null ? "" : dept.getDepartName();
List<String> standardIds = new ArrayList<>(); List<String> standardIds = new ArrayList<>();
records.forEach(kv -> standardIds.add(String.valueOf(kv.get(FieldCommon.ID)))); records.forEach(kv -> standardIds.add(String.valueOf(kv.get(FieldCommon.ID))));
List<LawsEnterpriseStandard> esList = enterpriseStandardService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>() List<LawsEnterpriseStandard> esList = enterpriseStandardService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>()
@@ -123,7 +124,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
List<String> levelDeptIds = standardLevelList.stream().map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); List<String> levelDeptIds = standardLevelList.stream().map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
// 起草部门有所有企标的查看权限 // 起草部门有所有企标的查看权限
if (dept.getDepartName().equals(draftDepartName)) { if (draftDepartName.equals(curDeptName)) {
// 全部设置为有权限 // 全部设置为有权限
records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true)); records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true));
} }
@@ -193,8 +194,9 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
SysUser user = sysUserService.getById(userId); SysUser user = sysUserService.getById(userId);
String deptId = user.getDepartIds(); String deptId = user.getDepartIds();
SysDepart dept = sysDepartService.getById(deptId); SysDepart dept = sysDepartService.getById(deptId);
String curDeptName = dept == null ? "" : dept.getDepartName();
// 起草部门有全部企标的查看权限 // 起草部门有全部企标的查看权限
if (dept.getDepartName().equals(draftDepartName)) { if (draftDepartName.equals(curDeptName)) {
return true; return true;
} }