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());