From 5a8dc24ed779656f27b16d0aee7aa9b617ffbfbf Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 18 Dec 2023 11:39:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=BA=E5=91=98=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/process/common/service/ActFlowCommonService.java  | 3 +--
 .../service/impl/ProcessEsAnnualInitServiceImpl.java           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index c671d550..7cb46669 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -443,11 +443,10 @@ public class ActFlowCommonService {
         updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId);
         updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
         updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
-        updateWrapper.set(ProcessApprovalRecord::getFinishFlag, ProcessStatusEnum.WITHDRAWN.getValue());
+        updateWrapper.set(ProcessApprovalRecord::getFinishFlag, CommitFlagEnum.UNDISPOSED.getValue());
         processApprovalRecordService.update(updateWrapper);
     }
 
-
     /**
      * 根据指定的执行Id递归获取所有子执行Id
      *
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 46d9ae6d..d05cc586 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
@@ -281,7 +281,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     taskService.setVariable(taskId, "approvalUserList", approvalUserSet);
                     // 保存人员
                     userMap.put("approvalUserList", String.join(",", approvalUserSet));
-                    processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
+                    processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                     dataList.forEach(data -> data.setExecutionId(executionId));
                     saveOrUpdateBatch(dataList);
                 } else {