From a155b2422cfb9080fc12b2f683ae098129e572bd Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Mon, 15 Jul 2024 10:47:44 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2596-=E4=B8=9A=E5=8A=A1=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=87=AA=E5=8A=A8=E8=BF=87=E5=AE=A1?= 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 e9a9190d6..0c3c75b3f 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.enums.BpmnFlowNodeType.NODE_BUSINESS; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_EMPTY; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_TASK; @@ -52,7 +53,8 @@ public class CheckApproverServiceImpl implements CheckApproverService { AtomicBoolean exists = new AtomicBoolean(false); FlowElement currentFlowElement = mainProcess.getFlowElement(delegateTask.getTaskDefinitionKey()); BpmnFlowNodeType currentNodeType = BpmnMetaParserHelper.getNodeType(currentFlowElement).orElse(NODE_EMPTY); - if (!Objects.equals(currentNodeType, NODE_TASK)) { + //业务节点,指定业务审批人,或者业务设置了审批人,也要参与自动过审,node_type为NODE_BUSINESS,节点元素类型为UserTask + if (!Objects.equals(currentNodeType, NODE_TASK) && !Objects.equals(currentNodeType, NODE_BUSINESS)) { return exists.get(); } Optional optConfig = BpmnMetaParserHelper.getButtonConfig(mainProcess, delegateTask.getTaskDefinitionKey());