From ada988a158ece409a09292e93abd4d30c521e488 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Mon, 15 Jul 2024 14:35:52 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2596-=E4=B8=9A=E5=8A=A1=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E6=8C=87=E5=AE=9A=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BA=BA,=E8=BF=98=E6=9C=AA=E6=8C=87=E5=AE=9A=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E4=BA=BA=E6=97=B6,=E4=B8=8D=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BF=87=E5=AE=A1=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/task/service/impl/CheckApproverServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/service/impl/CheckApproverServiceImpl.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/service/impl/CheckApproverServiceImpl.java index 6c1a0009a..e3e5cb77e 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/service/impl/CheckApproverServiceImpl.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/task/service/impl/CheckApproverServiceImpl.java @@ -31,6 +31,7 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_INITIATOR; +import static cn.axzo.workflow.common.constant.BpmnConstants.NO_ASSIGNEE; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_EMPTY; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER; @@ -54,7 +55,8 @@ public class CheckApproverServiceImpl implements CheckApproverService { FlowElement currentFlowElement = mainProcess.getFlowElement(delegateTask.getTaskDefinitionKey()); BpmnFlowNodeType currentNodeType = BpmnMetaParserHelper.getNodeType(currentFlowElement).orElse(NODE_EMPTY); //业务节点,指定业务审批人,或者业务设置了审批人,也要参与自动过审,node_type为NODE_BUSINESS,节点元素类型为UserTask - if (!Objects.equals(currentNodeType, NODE_TASK) && !Objects.equals(currentNodeType, NODE_BUSINESS)) { + //业务节点审批人为空,或者人员未指定,此时不进行自动过审操作,需要再业务指定审批人后,再做自动过审动作 + if (!Objects.equals(currentNodeType, NODE_TASK) && !Objects.equals(currentNodeType, NODE_BUSINESS) && !StringUtils.hasText(delegateTask.getAssignee()) && delegateTask.getAssignee().equals(NO_ASSIGNEE)) { return exists.get(); } Optional optConfig = BpmnMetaParserHelper.getButtonConfig(mainProcess, delegateTask.getTaskDefinitionKey());