From 0107602caf3d03f70d06c99b9f7e5385cdf06c11 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 16 Jan 2024 14:49:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=80=90=E5=85=A8=E5=B1=80=E3=80=91?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0=E4=B8=AD?= =?UTF-8?q?=E5=B8=A6=E6=9C=89=E5=AE=A1=E6=89=B9=E6=88=96=E4=BC=9A=E7=AD=BE?= =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9=E6=89=8D=E4=BC=9A=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/listener/MyGlobalEventListener.java | 7 +++++-- .../process/common/service/ActFlowCommonService.java | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java index a166a4a3..2c55f310 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java @@ -172,8 +172,11 @@ public class MyGlobalEventListener implements ActivitiEventListener { approvalRecord.setOverTime(between.toString()); Map variables = delegateTask.getVariables(); - // 第一个节点不需要设置commitFlag - if (variables.containsKey("pass") && !isFirstNodeTask(approvalRecord)) { + // 第一个节点不需要设置commitFlag 非审批节点也不需要设置commitFlag + if (variables.containsKey("pass") && + !isFirstNodeTask(approvalRecord) && + (approvalRecord.getTaskName().contains("审批") || + approvalRecord.getTaskName().contains("会签"))) { if ((Boolean) variables.get("pass")) { approvalRecord.setCommitFlag(CommitFlagEnum.PASS.getValue()); } else { 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 23645aad..c1c98ba5 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 @@ -155,7 +155,6 @@ public class ActFlowCommonService { */ public void updateApprovalInfo(CommonVO commonVO, String taskId, boolean pass) { ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); - approvalRecord.setCommitFlag(pass ? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue()); approvalRecord.setCommitText(commonVO.getCommitText()); approvalRecord.setCommitFile(commonVO.getCommitFile()); approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());