From f1c8ff1ec6a85c4027af252e95537c38d7d2d181 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Mon, 6 May 2024 14:48:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20-=20=E5=BC=82=E6=AD=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=89=A9=E5=B1=95=E8=A1=A8=E5=BC=82=E6=AD=A5=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=9A=84=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/listener/impl/ExtTaskInstEventListener.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java index 7b7ed73ea..54a7fb43a 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/listener/impl/ExtTaskInstEventListener.java @@ -12,7 +12,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.flowable.common.engine.api.delegate.event.AbstractFlowableEventListener; import org.flowable.common.engine.api.delegate.event.FlowableEvent; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -41,7 +40,6 @@ public class ExtTaskInstEventListener extends AbstractFlowableEventListener { .add(UPDATE) .build(); - @Async @Override public void onEvent(FlowableEvent flowableEvent) { if (flowableEvent instanceof ExtTaskInstEvent) { From 7389362d13c7713b634a499a5c14798ac7df49f3 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Mon, 6 May 2024 15:02:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20-=20=E4=BF=AE=E5=A4=8D=E7=BD=91?= =?UTF-8?q?=E5=85=B3=E5=8C=85=E5=90=ABchildren=E8=8A=82=E7=82=B9=E8=B7=AF?= =?UTF-8?q?=E7=A8=8B=E8=BD=AC=E6=8D=A2=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/common/utils/BpmnJsonConverterUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java index 60391da9b..b9c4fa739 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java @@ -95,6 +95,7 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.TEMPLATE_PENDING_ME import static cn.axzo.workflow.common.constant.BpmnConstants.TEMPLATE_SMS_MESSAGE_ID; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_CONDITION; import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_EMPTY; +import static cn.axzo.workflow.common.enums.BpmnFlowNodeType.NODE_EXCLUSIVE_GATEWAY; import static cn.axzo.workflow.core.common.code.ConvertorRespCode.CONVERTOR_COMMON_ERROR; import static cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper.getButtonConfig; import static cn.axzo.workflow.core.common.utils.BpmnMetaParserHelper.getFieldConfig; @@ -494,6 +495,10 @@ public final class BpmnJsonConverterUtil { children = children.getChildren(); } if (CollectionUtils.isEmpty(branchLastNodeIds)) { + //网关分支条件连接到下一节点，children节点不再连接前继网关节点 + if (bpmnJsonNode.getType() == NODE_EXCLUSIVE_GATEWAY) { + return create(children, mainProcess, bpmnModel, defaultConditionConnectNode); + } return create(children, mainProcess, bpmnModel, defaultConditionConnectNode, flowElement.getId()); } return create(children, mainProcess, bpmnModel, defaultConditionConnectNode, branchLastNodeIds.toArray(new String[0]));