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 ef265300c..5e21598d4 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 @@ -447,7 +447,8 @@ public final class BpmnJsonConverterUtil { ? bpmnJsonNode.getChildren() : branch.getChildren(); if (Objects.isNull(nextJsonNode) || Objects.isNull(nextJsonNode.getId()) || - (Objects.equals(NODE_EMPTY, nextJsonNode.getType()) && Objects.isNull(nextJsonNode.getChildren()))) { + (Objects.equals(NODE_EMPTY, nextJsonNode.getType()) && + (Objects.isNull(nextJsonNode.getChildren()) || Objects.isNull(nextJsonNode.getChildren().getId())))) { BpmnJsonNode tempEndNode = new BpmnJsonNode(); tempEndNode.setIncoming(Lists.newArrayList(gateway.getId())); tempEndNode.setId(END_EVENT_ID);