From 95807ef346aee5d6a4e0971e973456b2787e0c3a Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 14 Dec 2023 09:07:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86):=20?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DocumentSplitServiceImpl.java        | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 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 e90b9cc4..c5ebff6b 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
@@ -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<>();