From 17849f6bef5926c24dd9b7fc7084cb97d8b3af42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 16 Jul 2024 10:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B=E3=80=81=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessMarketStandardReleaseServiceImpl.java | 4 +++-
 .../ni/service/impl/ProcessNewStandardImportServiceImpl.java  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
index e8ed5bd6..ae9f35c4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
@@ -178,7 +178,9 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         if(Objects.equals(ProcessMarketStandardReleaseConstants.STANDARD_ENGINEER_START,xmlNodeId)){
             startNodeBusProcess(processInfoVO);
         }else{
-            processTask.setCommitFlag(pass ? ActivitiCommon.COMMIT_FLAG1 : ActivitiCommon.COMMIT_FLAG2);
+            if(Objects.isNull(processTask.getCommitFlag())){
+                processTask.setCommitFlag(pass ? ActivitiCommon.COMMIT_FLAG1 : ActivitiCommon.COMMIT_FLAG2);
+            }
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
index 4fc08664..7fdc4846 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
@@ -173,7 +173,9 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         if(Objects.equals(ProcessNewStandardImportConstants.STANDARD_ENGINEER_START,xmlNodeId)){
             startNodeBusProcess(processInfoVO);
         }else{
-            processTask.setCommitFlag(pass ? ActivitiCommon.COMMIT_FLAG1 : ActivitiCommon.COMMIT_FLAG2);
+            if(Objects.isNull(processTask.getCommitFlag())){
+                processTask.setCommitFlag(pass ? ActivitiCommon.COMMIT_FLAG1 : ActivitiCommon.COMMIT_FLAG2);
+            }
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);