From 50e4ddb71a09cb41506e19c3e03636cf5227eb05 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 14 Nov 2023 07:12:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E6=9D=83=E9=99=903?= =?UTF-8?q?=E7=BA=A7=E6=94=B9=E4=B8=BA=E4=B8=BB=E8=B5=B7=E8=8D=89=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...EnterpriseStandardAuthUserServiceImpl.java | 74 ++++++++----------- .../service/impl/LawsGradeServiceImpl.java | 6 +- .../src/main/resources/application-dev.yml | 3 - .../src/main/resources/application-prod.yml | 5 +- 4 files changed, 35 insertions(+), 53 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java index b837a6de..4692c739 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java @@ -67,10 +67,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId())) .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - // 起草部门有所有企标的查看权限 - if (!departNames.isEmpty() && departNames.contains(draftDepartName)) { - // 全部设置为有权限 - records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true)); - return; - } - // 获取起草部门的Id - List sysDeparts = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getDepartName, draftDepartName)); for (Map map : records) { String standardId = (String) map.get(FieldCommon.ID); + LawsEnterpriseStandard es = esMap.get(standardId); + String mainDraftUnit = es.getMainDraftingUnit(); Set curAuthSet = authDeptList.stream() .filter(e -> e.getAuthDept() != null) .filter(e -> StrUtil.isNotEmpty(e.getAuthDept())) .filter(e -> e.getStandardId().equals(standardId)) - .filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId())) + .filter(e -> !e.getAuthDept().equals(mainDraftUnit)) .collect(Collectors.toSet()); - LawsEnterpriseStandard es = esMap.get(standardId); // 临时权限 if (tempAuthStandardIds.contains(standardId)) { map.put(FieldCommon.DETAIL_FLAG, true); @@ -219,6 +208,14 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId())) .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - // 起草部门有所有企标的查看权限 - if (!departNames.isEmpty() && departNames.contains(draftDepartName)) { - // 全部设置为有权限 - records.forEach(kv -> kv.put(FieldCommon.DETAIL_FLAG, true)); - } // 获取起草部门的Id - List sysDeparts = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getDepartName, draftDepartName)); for (Map map : records) { String standardId = (String) map.get(FieldCommon.ID); + LawsEnterpriseStandard es = esMap.get(standardId); + String mainDraftUnit = es.getMainDraftingUnit(); Set curAuthSet = authDeptList.stream() .filter(e -> e.getAuthDept() != null) .filter(e -> StrUtil.isNotEmpty(e.getAuthDept())) .filter(e -> e.getStandardId().equals(standardId)) - .filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId())) + .filter(e -> !e.getAuthDept().equals(mainDraftUnit)) .collect(Collectors.toSet()); - LawsEnterpriseStandard es = esMap.get(standardId); // 临时权限 if (tempAuthStandardIds.contains(standardId)) { map.put(FieldCommon.DETAIL_FLAG, true); @@ -329,6 +321,14 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl departIdModels = sysUserDepartService.queryDepartIdsOfUser(userId); List departNames = departIdModels.stream().map(DepartIdModel::getTitle).collect(Collectors.toList()); - // 起草部门有全部企标的查看权限 - if (departNames.contains(draftDepartName)) { - records.forEach(kv -> kv.put(FieldCommon.EDIT_FLAG, true)); - return; - } // 获取当前用户的角色roleCode List roleList = sysUserRoleService.getRole(currentUser.getUsername()); if (roleList != null && roleList.contains(FieldCommon.ROLE_ADMIN)) { @@ -515,23 +510,17 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId())) .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - // 起草部门有所有企标的查看权限 - if (!departNames.isEmpty() && departNames.contains(draftDepartName)) { - // 全部设置为有权限 - return true; - } // 获取起草部门的Id - List sysDeparts = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getDepartName, draftDepartName)); String finalStandardId = standardId; + LawsEnterpriseStandard es = enterpriseStandardService.getById(standardId); + String mainDraftUnit = es.getMainDraftingUnit(); Set curAuthSet = authDeptList.stream() .filter(e -> e.getAuthDept() != null) .filter(e -> StrUtil.isNotEmpty(e.getAuthDept())) .filter(e -> e.getStandardId().equals(finalStandardId)) - .filter(e -> !e.getAuthDept().equals(sysDeparts.get(0).getId())) + .filter(e -> !e.getAuthDept().equals(mainDraftUnit)) .collect(Collectors.toSet()); - LawsEnterpriseStandard es = enterpriseStandardService.getById(standardId); - // 临时权限 if (tempAuthStandardIds.contains(standardId)) { return true; @@ -560,6 +549,13 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl departIdModels = sysUserDepartService.queryDepartIdsOfUser(userId); - List departNames = departIdModels.stream().map(DepartIdModel::getTitle).collect(Collectors.toList()); - if (departNames.contains(draftDepartName)) { - return true; - } // 获取当前用户的角色roleCode List roleList = sysUserRoleService.getRole(currentUser.getUsername()); diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java index 000e6b1c..1578cf59 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsGradeServiceImpl.java @@ -36,9 +36,6 @@ public class LawsGradeServiceImpl extends ServiceImpl queryList() { List grades = lawsGradeService.list(); @@ -58,7 +55,8 @@ public class LawsGradeServiceImpl extends ServiceImpl