From f15cdab842ac69c3d3e3fdd9ffa7666c96daa2a9 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 17 Oct 2023 17:43:52 +0800
Subject: [PATCH] =?UTF-8?q?add=20-=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E7=9A=84=20JSON=20=E8=BD=AC=20BPMN=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/workflow/core/common/utils/BpmTransformUtil.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
index a403f0dd7..28dc6daa2 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
@@ -117,7 +117,7 @@ public class BpmTransformUtil {
                         if (BpmFlowNodeType.NODE_CONDITION.equals(parentNode.getType())) {
                             sequenceFlowId = parentNode.getId();
                             flow.setName(parentNode.getName());
-                            if (!ObjectUtils.isEmpty(parentNode.getProperty()) && !Boolean.TRUE.equals(parentNode.getProperty().getDefaultCondition())) {
+                            if (!ObjectUtils.isEmpty(parentNode.getProperty()) && !Boolean.TRUE.equals(parentNode.getProperty().getDefaultBranch())) {
                                 //解析条件表达式
                                 StringBuffer conditionExpression = new StringBuffer();
                                 conditionExpression.append("${ ");
@@ -216,7 +216,7 @@ public class BpmTransformUtil {
         List<Map> conditions = Lists.newCopyOnWriteArrayList();
         for (BpmnJsonNode element : branches) {
             if (!ObjectUtils.isEmpty(element.getProperty())) {
-                Boolean typeElse = element.getProperty().getDefaultCondition();
+                Boolean typeElse = element.getProperty().getDefaultBranch();
                 if (Boolean.TRUE.equals(typeElse)) {
                     exclusiveGateway.setDefaultFlow(element.getId());
                 }