From f31447820bfc1c5837959070dceb67dbbf298129 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 31 Jan 2024 15:29:35 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsInitChangeServiceImpl.java     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 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 29aeb2bc..054beb6f 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
@@ -29,8 +29,10 @@ import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.service.ILawsCommonService;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
 import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
@@ -98,6 +100,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     @Resource
     private TranslationAspect translationAspect;
 
+    @Resource
+    private EnterpriseStandardAuthDeptService esAdService;
+
     @Override
     public void startProcess(InitChangeDataVO initChangeData) {
         // 发起的时候校验标准编号是是否重复
@@ -246,6 +251,12 @@ 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(","));
         // 获取当前年份
         Calendar date = Calendar.getInstance();
         String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
@@ -262,12 +273,13 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
                 .setStandardCategoryCode((String) es.get(FieldCommon.STANDARD_CATEGORY_CODE))
                 .setCompilationDescription((String) es.get(FieldCommon.COMP_ILLUSTRATION))
                 .setComponentName((String) es.get(FieldCommon.PART_NAME))
-                .setAuthDept((String) es.get(FieldCommon.AUTH_DEPT))
                 .setMainDraftingUser((String) es.get(FieldCommon.MAIN_DRAFTING_USER))
                 .setMainDraftingUnit((String) es.get(FieldCommon.MAIN_DRAFTING_UNIT))
                 .setMainDraftingUnitResponsiblePerson((String) es.get(FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON))
                 .setStandardPromoter((String) es.get(FieldCommon.STANDARD_PROMOTER))
-                .setCooperationUnit((String) es.get(FieldCommon.COOPERATION_UNIT));
+                .setCooperationUnit((String) es.get(FieldCommon.COOPERATION_UNIT))
+                .setEnStandardClassification((String) es.get(FieldCommon.GRADE_CLASSIFICATION))
+                .setAuthDept(authDeptIds);
     }
 
     @Override