From e0cf547f2735968f6417aebc12a732ec14e6cb2e Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 11 Dec 2023 12:30:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=A4=84=E7=90=86=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E7=9A=84=20JSON=20=E8=BD=AC=20BPMN=20=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);