From aa064303b68d2b38a9e1a58010915015b625c3bd Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 31 Jan 2024 16:11:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081551=20=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9--=E5=A4=8D=E5=AE=A1=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=91=E8=B5=B7=E7=9A=84=E4=BF=AE=E8=AE=A2--?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A0=87=E5=87=86=E7=AD=89=E7=BA=A7=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E3=80=81=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B8=A6=E5=87=BA=20caihaohan=2042=20minutes=20ago?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java   | 10 ++--------
 .../common/service/impl/LawsCommonServiceImpl.java     |  9 +++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 054beb6f..c8d3c54c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -250,13 +250,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     }
 
     private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
-        Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", standardNo);
-        // 找到当前企标的所有授权部门
-        LambdaQueryWrapper<EnterpriseStandardAuthDept> adWrapper = new LambdaQueryWrapper<>();
-        adWrapper.eq(EnterpriseStandardAuthDept::getStandardId, es.get(FieldCommon.ID));
-        String authDeptIds = esAdService.list(adWrapper).stream()
-                .map(EnterpriseStandardAuthDept::getAuthDept)
-                .distinct().collect(Collectors.joining(","));
+        Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "1", standardNo);
         // 获取当前年份
         Calendar date = Calendar.getInstance();
         String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
@@ -279,7 +273,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
                 .setStandardPromoter((String) es.get(FieldCommon.STANDARD_PROMOTER))
                 .setCooperationUnit((String) es.get(FieldCommon.COOPERATION_UNIT))
                 .setEnStandardClassification((String) es.get(FieldCommon.GRADE_CLASSIFICATION))
-                .setAuthDept(authDeptIds);
+                .setAuthDept((String) es.get(FieldCommon.AUTH_DEPT));
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index dce75db3..94bd1105 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -160,6 +160,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
     @Resource
     private PartNameService partNameService;
 
+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
     /**
      * @Author: liao
      * @Date: 2023/8/23 16:57
@@ -1146,6 +1149,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         if (StringUtils.isBlank(id) && StringUtils.isBlank(standardNumber)) {
             throw new JeroBootException(ResultCommon.EMPTY_COMMON, "id和标准号不能同时为空");
         }
+        if (StrUtil.isBlank(id) && module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
+            // 根据标准号获取id
+            LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
+            esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber);
+            id = esService.list(esWrapper).get(0).getId();
+        }
         // 获取要操作的表名
         String tableName = TableNameEnum.getTableName(module);
         // 获取全部字段