From 0d74855ae241728161ceb4842c68d080312fbd05 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 30 Oct 2023 17:33:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=205=E4=B8=AA=E6=B5=81=E7=A8=8B=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAbolishServiceImpl.java    | 11 ++++++-----
 .../service/impl/ProcessEsArchiveServiceImpl.java    | 12 +++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
index d7de9199..fbb53a3a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
@@ -207,6 +207,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
     public void approvalInitChange(ESAbolishDataVO abolishData, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = abolishData.getCommon();
+        ProcessEsAbolish data = abolishData.getData();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
@@ -214,11 +215,11 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         if (pass) {
-            ESAbolishFlowUserVO flowUserInfoVO = abolishData.getFlowUser();
-            if (flowUserInfoVO != null) {
-                Map<String, Object> userMap = new HashMap<>(this.setUserVariables(flowUserInfoVO));
-                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
-                Map<String, Object> variables = setUserVariables(flowUserInfoVO);
+            if (data != null) {
+                saveOrUpdate(data);
+                ESAbolishFlowUserVO flowUserInfoVO = abolishData.getFlowUser();
+                Map<String, Object> variables = this.setVariables(flowUserInfoVO);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
                 actFlowCommonService.setProcessVariables(processInstanceId, variables);
             }
             runtimeService.setVariable(processInstanceId, "pass", true);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
index 27ea41da..3b105a12 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
@@ -14,6 +14,7 @@ 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.common.service.ProcessDraftService;
+import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishFlowUserVO;
 import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveFlowUserVO;
@@ -207,6 +208,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
     public void approvalInitChange(ESArchiveDataVO archiveData, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = archiveData.getCommon();
+        ProcessEsArchive data = archiveData.getData();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException("taskId为空或任务不存在");
@@ -214,11 +216,11 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
         if (pass) {
-            ESArchiveFlowUserVO flowUserInfoVO = archiveData.getFlowUser();
-            if (flowUserInfoVO != null) {
-                Map<String, Object> userMap = new HashMap<>(this.setUserVariables(flowUserInfoVO));
-                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
-                Map<String, Object> variables = setUserVariables(flowUserInfoVO);
+            if (data != null) {
+                saveOrUpdate(data);
+                ESArchiveFlowUserVO flowUserInfoVO = archiveData.getFlowUser();
+                Map<String, Object> variables = this.setVariables(flowUserInfoVO);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
                 actFlowCommonService.setProcessVariables(processInstanceId, variables);
             }
             runtimeService.setVariable(processInstanceId, "pass", true);