From 4a3222c10db71f7517c994bb8e44421bd76483de Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 13 Aug 2024 11:42:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088486=20=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B--?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E7=9A=84=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E4=B8=BA=E7=A9=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessStandardComplianceCheckServiceImpl.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 3fa05450..0027ce2f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -18,6 +18,7 @@ import com.jero.modules.activiti.common.ActivitiCommon;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.entity.ProcessNode;
+import com.jero.modules.activiti.enums.CommitFlagEnum;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
@@ -293,12 +294,13 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         processHandleService.saveToSnapshot(processInfoVO, curUserId);
         // 审批节点
         actFlowCommonService.completeTask(taskId, curUserId);
+        // 驳回，结束所有节点
+        approvalRecordService.updateApprovalRecordFinishFlag(pass, taskId, xmlNodeId, processInstanceId);
         // 更新审批表为完成，填充数据
+        processTask.setCommitFlag(pass ? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue());
         actFlowCommonService.updateApprovalInfo(processTask, taskId);
         // 删除草稿
         actFlowCommonService.removeDraft(curUserId, taskId, processInstanceId);
-        // 驳回，结束所有节点
-        approvalRecordService.updateApprovalRecordFinishFlag(pass, taskId, xmlNodeId, processInstanceId);
     }
 
     @Override