fix: 企标标准等级分类权限按照授权部门判断权限

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())) {

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<Enterpris
     @Resource
     private ILawsEnterpriseStandardService enterpriseStandardService;
 
-    @Resource
-    private ILawsEnterpriseStandardLevelService standardLevelService;
-
     @Resource
     private ISysUserService sysUserRoleService;
 
     @Resource
     private ISysUserDepartService sysUserDepartService;
 
-    @Resource
-    private ILawsGradeService gradeService;
-
     @Resource
     private EnterpriseStandardAuthUserMapper authUserMapper;
 
@@ -208,16 +197,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         List<EnterpriseStandardAuthDept> authDeptList = authDeptService.list(authDeptWrapper);
         authDeptList.addAll(authDeptService.list(authDeptWrapper));
 
-        // 企标级别授权的部门
-        List<LawsEnterpriseStandardLevel> standardLevelList = standardLevelService.list();
-        List<LawsGrade> gradeList = gradeService.list();
-        Map<Integer, LawsGrade> gradeMap = gradeList.stream().collect(Collectors.toMap(LawsGrade::getLevel, e -> e));
-
-        List<String> levelOneDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(1).getId()))
-                .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
-        List<String> levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId()))
-                .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
-
         for (Map<String, Object> 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<Enterpris
                     continue;
                 }
             }
-            // 企标等级分类级别可查看部门
-            if ("2".equals(gradeClassification)) {
-                if (levelOneDeptIds.stream().anyMatch(departIds::contains)) {
-                    map.put(FieldCommon.DETAIL_FLAG, true);
-                    continue;
-                }
-            }
-            if ("3".equals(gradeClassification)) {
-                if (levelTwoDeptIds.stream().anyMatch(departIds::contains)) {
-                    map.put(FieldCommon.DETAIL_FLAG, true);
-                    continue;
-                }
-            }
             if ("4".equals(gradeClassification)) {
                 // 主起草部门有企标的查看权限
                 if (!departNames.isEmpty() && departNames.contains(mainDraftUnit)) {
@@ -332,16 +298,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         List<EnterpriseStandardAuthDept> authDeptList = authDeptService.list(authDeptWrapper);
         authDeptList.addAll(authDeptService.list(authDeptWrapper));
 
-        // 企标级别授权的部门
-        List<LawsEnterpriseStandardLevel> standardLevelList = standardLevelService.list();
-        List<LawsGrade> gradeList = gradeService.list();
-        Map<Integer, LawsGrade> gradeMap = gradeList.stream().collect(Collectors.toMap(LawsGrade::getLevel, e -> e));
-
-        List<String> levelOneDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(1).getId()))
-                .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
-        List<String> levelTwoDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(2).getId()))
-                .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
-
         // 获取起草部门的Id
         for (Map<String, Object> map : records) {
             String standardId = (String) map.get(FieldCommon.ID);
@@ -373,19 +329,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
                     continue;
                 }
             }
-            // 企标等级分类级别可查看部门
-            if ("2".equals(gradeClassification)) {
-                if (levelOneDeptIds.stream().anyMatch(departIds::contains)) {
-                    map.put(FieldCommon.DETAIL_FLAG, true);
-                    continue;
-                }
-            }
-            if ("3".equals(gradeClassification)) {
-                if (levelTwoDeptIds.stream().anyMatch(departIds::contains)) {
-                    map.put(FieldCommon.DETAIL_FLAG, true);
-                    continue;
-                }
-            }
             if ("4".equals(gradeClassification)) {
                 // 主起草部门有企标的查看权限
                 if (!departNames.isEmpty() && departNames.contains(mainDraftUnit)) {
@@ -686,16 +629,6 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
         List<EnterpriseStandardAuthDept> authDeptList = authDeptService.list(authDeptWrapper);
         authDeptList.addAll(authDeptService.list(authDeptWrapper));
 
-        // 企标级别授权的部门
-        List<LawsEnterpriseStandardLevel> standardLevelList = standardLevelService.list();
-        List<LawsGrade> gradeList = gradeService.list();
-        Map<Integer, LawsGrade> gradeMap = gradeList.stream().collect(Collectors.toMap(LawsGrade::getLevel, e -> e));
-
-        List<String> levelOneDeptIds = standardLevelList.stream().filter(l -> l.getGradeId().equals(gradeMap.get(1).getId()))
-                .map(LawsEnterpriseStandardLevel::getDeptId).collect(Collectors.toList());
-        List<String> 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<Enterpris
                 return true;
             }
         }
-        // 企标等级分类级别可查看部门
-        if ("2".equals(gradeClassification)) {
-            if (levelOneDeptIds.stream().anyMatch(departIds::contains)) {
-                return true;
-            }
-        }
-        if ("3".equals(gradeClassification)) {
-            if (levelTwoDeptIds.stream().anyMatch(departIds::contains)) {
-                return true;
-            }
-        }
         if ("4".equals(gradeClassification)) {
             // 主起草部门有企标的查看权限
             // 全部设置为有权限