From 3f8f3041976a75d35ed99368e03138fdc44e4b2a Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Jul 2024 15:49:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=88=86=E7=B1=BB=E6=9D=83=E9=99=90=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DocumentSplitServiceImpl.java | 13 ---- ...EnterpriseStandardAuthUserServiceImpl.java | 78 ------------------- 2 files changed, 91 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 0ca0a0ce..4017795b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -500,19 +500,6 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { return; } } else { - // 企标等级分类级别可查看部门 - if ("2".equals(gradeClassification)) { - if (levelOneDeptIds.stream().anyMatch(departIds::contains)) { - // 有权限 - return; - } - } - if ("3".equals(gradeClassification)) { - if (levelTwoDeptIds.stream().anyMatch(departIds::contains)) { - // 有权限 - return; - } - } if ("4".equals(gradeClassification)) { // 主起草部门有企标的查看权限 if (!departNames.isEmpty() && departNames.contains(lawsEnterpriseStandard.getMainDraftingUnit())) { 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 c3c13106..d8b91889 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 @@ -11,7 +11,6 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; -import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser; import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper; @@ -24,10 +23,6 @@ import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; -import com.jero.modules.sys.entity.LawsEnterpriseStandardLevel; -import com.jero.modules.sys.entity.LawsGrade; -import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService; -import com.jero.modules.sys.service.ILawsGradeService; import com.jero.modules.sys.utils.UserUtils; import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.SysUser; @@ -71,18 +66,12 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl authDeptList = authDeptService.list(authDeptWrapper); authDeptList.addAll(authDeptService.list(authDeptWrapper)); - // 企标级别授权的部门 - List standardLevelList = standardLevelService.list(); - List gradeList = gradeService.list(); - Map gradeMap = gradeList.stream().collect(Collectors.toMap(LawsGrade::getLevel, e -> e)); - - List levelOneDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(1).getId())) - .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - List levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId())) - .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - for (Map map : records) { String standardId = (String) map.get(FieldCommon.ID); String creatUser = (String) map.get(FieldCommon.CREATE_BY); @@ -255,19 +234,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl authDeptList = authDeptService.list(authDeptWrapper); authDeptList.addAll(authDeptService.list(authDeptWrapper)); - // 企标级别授权的部门 - List standardLevelList = standardLevelService.list(); - List gradeList = gradeService.list(); - Map gradeMap = gradeList.stream().collect(Collectors.toMap(LawsGrade::getLevel, e -> e)); - - List levelOneDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(1).getId())) - .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - List levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId())) - .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - // 获取起草部门的Id for (Map map : records) { String standardId = (String) map.get(FieldCommon.ID); @@ -373,19 +329,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl authDeptList = authDeptService.list(authDeptWrapper); authDeptList.addAll(authDeptService.list(authDeptWrapper)); - // 企标级别授权的部门 - List standardLevelList = standardLevelService.list(); - List gradeList = gradeService.list(); - Map gradeMap = gradeList.stream().collect(Collectors.toMap(LawsGrade::getLevel, e -> e)); - - List levelOneDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(1).getId())) - .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - List levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId())) - .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList()); - // 获取起草部门的Id String finalStandardId = standardId; LawsEnterpriseStandard es = enterpriseStandardService.getById(standardId); @@ -730,17 +663,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl