From c511c18b3d04c9037340ddf06481814aca1fe818 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 8 Jan 2024 15:40:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4"=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=8C=87=E5=AE=9A=E5=AE=A1=E6=89=B9=E4=BA=BA"?= =?UTF-8?q?=E7=9A=84=20operationDesc=20=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BpmnProcessInstanceServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java index 69e6c6c71..325816b86 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessInstanceServiceImpl.java @@ -80,9 +80,11 @@ import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AND; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_PASSED; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.AUTO_REJECTED; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.BUSINESS_BIZ_SPECIFY; +import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.GENERAL; import static cn.axzo.workflow.common.enums.BpmnFlowNodeMode.OR; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_BUSINESS; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_CARBON_COPY; +import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_STARTER; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_TASK; import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS; import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_NOT_EXISTS; @@ -566,7 +568,11 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic node.setId(userTask.getId()) .setName(userTask.getName()) .setFormKey(userTask.getFormKey()) - .setNodeType(NODE_TASK); + .setNodeType(NODE_TASK) + .setNodeMode(GENERAL);//兜底设置 + if (Objects.equals(NODE_STARTER.getType(), i.getId())) { + node.setNodeType(NODE_STARTER); + } getApprovalMethod(userTask).ifPresent(approvalMethod -> { switch (approvalMethod) { @@ -588,6 +594,8 @@ public class BpmnProcessInstanceServiceImpl implements BpmnProcessInstanceServic AND : OR); } else if (userTask.getBehavior() instanceof UserTaskActivityBehavior) { node.setNodeMode(BpmnFlowNodeMode.GENERAL); + } else { + node.setNodeMode(BpmnFlowNodeMode.GENERAL); } break; }