From 598707a090c79ec133a6b2e89e171f2137f6b040 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Dec 2023 11:30:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esRecheck/entity/ProcessEsRecheck.java     |  8 +++++++-
 .../impl/ProcessEsRecheckServiceImpl.java      | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
index 2b0d4a37..890f1d0f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
@@ -135,7 +135,13 @@ public class ProcessEsRecheck implements Serializable {
      * 是否显示
      */
     @ApiModelProperty(value = "0不显示 1显示")
-    private Integer ShowFirstNode;
+    private Integer showFirstNode;
+
+    /**
+     * 联络人
+     */
+    @ApiModelProperty(value = "联络人")
+    private String standardizationUser;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index c7e6b052..2df01002 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -178,6 +178,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
     public void approval(ESRecheckDataVO recheckData, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = recheckData.getCommon();
+        ProcessEsRecheck data = recheckData.getData();
+        Map<String, Object> flowUser = recheckData.getFlowUser();
         String taskId = commonVO.getTaskId();
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
@@ -185,6 +187,22 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         if (pass) {
             saveOrUpdate(recheckData.getData());
+            if (flowUser != null) {
+                // 人员数据
+                Map<String, Object> variables = recheckData.getFlowUser();
+                // 设置第联络人节点人员
+                actFlowCommonService.putIfNotNull(variables, "standardizationUser", data.getStandardizationUser());
+                // 设置流程变量
+                Map<String, Object> actVariables = this.setVariables(variables);
+                // 根据流程实例Id获取流程定义ID
+                ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+                // 获取流程实例ID
+                String processDefinitionId = processInstance.getProcessDefinitionId();
+                // 手动设置所有流程变量
+                actFlowCommonService.setProcessVariables(processInstanceId, actVariables);
+                // 保存选人信息
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));
+            }
         }
         // 设置流程变量
         runtimeService.setVariable(processInstanceId, "pass", pass);