From 49d32c2a5a47e2b02d8407681897b2619e0ff0be Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 26 Jan 2024 10:10:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080862=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92(=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B5=B7)=EF=BC=88=E9=83=A8=E6=89=80?=
 =?UTF-8?q?=E8=81=94=E7=BB=9C=E4=BA=BA=E9=80=89=E5=8F=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=89=20=E9=A9=B3=E5=9B=9E=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=B5=B0=E5=88=B0=E4=BA=86=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8C=96=E5=BD=92=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 4c41145f..8898efc6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -194,11 +194,13 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
         Set<String> contactUserSet = dataList.stream().map(ProcessEsAnnualInit::getContactUser).collect(Collectors.toSet());
         actVariables.put("contactUserList", contactUserSet);
+        actVariables.put("passFinalCollect", true);
         actVariables.put("standardEngineer", flowUser.get("standardEngineer"));
         return actVariables;
     }
 
     private Map<String, Object> getUserMap(Map<String, Object> variables) {
+        variables.remove("passFinalCollect");
         // 转成逗号拼接
         variables.put("contactUserList", Optional.ofNullable((HashSet<String>) variables.get("contactUserList"))
                 .map(list -> String.join(",", list))
@@ -382,6 +384,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 // 保存人员
                 userMap.put("mainDraftUser", String.join(",", mainDraftUserSet));
                 processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
+                // 能走到这个节点则不需要跳过最终汇总
+                taskService.setVariable(taskId, "passFinalCollect", false);
                 break;
             case CONTACT_USER_COLLECT:
                 dataList = annualInitData.getDataList();