From 126508f0d63cf0972ad216e71d25b0fd9fbe33cf Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 6 Dec 2023 18:27:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=88=86=E6=94=AF=E5=9B=9E=E6=98=BE=E4=BA=BA=E5=91=98?=
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 67369a77..523fbd74 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
@@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConsta
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
+import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
@@ -189,7 +190,18 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
             if (flowUserInfoVO != null && !flowUserInfoVO.isEmpty()) {
                 Map<String, Object> variables = setVariables(initChangeDataVO);
                 actFlowCommonService.setProcessVariables(processInstanceId, variables);
-                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, getUserMap(variables));
+                Map<String, Object> userMap = getUserMap(variables);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
+                // 如果是责任部门变更分支，后几个流程需要将部分选人信息保存到业务表中
+                String newMainDraftUserLeaderLeader = (String) userMap.get("newMainDraftUserLeaderLeader");
+                String newMainDraftUserLeader = (String) userMap.get("newMainDraftUserLeader");
+                String relatedUserList = (String) userMap.get("relatedUserList");
+                LambdaUpdateWrapper<ProcessEsInitChange> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);
+                updateWrapper.set(StrUtil.isNotBlank(newMainDraftUserLeaderLeader), ProcessEsInitChange::getNewMainDraftUserLeaderLeader, newMainDraftUserLeaderLeader);
+                updateWrapper.set(StrUtil.isNotBlank(newMainDraftUserLeader), ProcessEsInitChange::getNewMainDraftUserLeader, newMainDraftUserLeader);
+                updateWrapper.set(StrUtil.isNotBlank(relatedUserList), ProcessEsInitChange::getRelatedUserList, relatedUserList);
+                update(updateWrapper);
             }
             runtimeService.setVariableLocal(processInstanceId, "pass", true);
         } else {
@@ -202,8 +214,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.completeTask(taskId, userId);
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
+        // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
         if (!pass) {
-            // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
             if (taskName.equals(CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME)) {
                 actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
             }