fix(标准拆分): 企标权限校验修改

laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java

@@ -16,7 +16,6 @@ import com.jero.common.util.FileUtils;
 import com.jero.common.util.MessageUtils;
 import com.jero.common.util.UUIDUtils;
 import com.jero.common.util.ZipUtil;
-import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink;
 import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.mapper.LawsCommonMapper;
@@ -158,8 +157,6 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
 
     @Value("${jero.path.exportExcelTempPath}")
     private String exportExcelTempPath;
-    @Value("${draftDepartName}")
-    private String draftDepartName;
     @Value("#{'${adminRoleCode}'.split(',')}")
     private List<String> adminRoleCodeList;
 
@@ -352,6 +349,15 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
 
     @Override
     public void enterpriseCheck(SarFileSplitInfoEO sarFileSplitInfoEO) {
+        // 登陆人信息
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // 管理员有所有企标的权限
+        List<String> roleIdList = Arrays.asList(sysUser.getRoleIds().split(","));
+        Collection<String> intersection = CollectionUtils.intersection(adminRoleCodeList, roleIdList);
+        if (!intersection.isEmpty()){
+            // 有权限
+            return;
+        }
         // 企标
         LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne(
                 new LambdaQueryWrapper<LawsEnterpriseStandard>()
@@ -361,26 +367,11 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             if (StringUtils.isBlank(sarFileSplitInfoEO.getStandardId())){
                 sarFileSplitInfoEO.setStandardId(id);
             }
-            // 登陆人信息
-            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-            // 管理员有所有企标的权限
-            List<String> roleIdList = Arrays.asList(sysUser.getRoleIds().split(","));
-            Collection<String> intersection = CollectionUtils.intersection(adminRoleCodeList, roleIdList);
-            if (!intersection.isEmpty()){
-                // 有权限
-                return;
-            }
             // 登陆人所在部门
             List<DepartIdModel> departIdModels = sysUserDepartService.queryDepartIdsOfUser(sysUser.getId());
             List<String> departIds = departIdModels.stream().map(DepartIdModel::getKey).collect(Collectors.toList());
             List<String> departNames = departIdModels.stream().map(DepartIdModel::getTitle).collect(Collectors.toList());
 
-            // 起草部门有所有企标的查看权限
-            if (!departNames.isEmpty() && departNames.contains(draftDepartName)) {
-                // 有权限
-                return;
-            }
-
             // 查询临时授权人员
             Date date = new Date();
             LambdaQueryWrapper<EnterpriseStandardAuthUser> authUserWrapper = new LambdaQueryWrapper<>();