From 43fedb88140f3c7a4d721c94394dccacdb8205a6 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 8 Dec 2023 12:27:32 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=20condition=20?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8B=BC=E6=8E=A5=E6=9D=A1=E4=BB=B6=E7=BB=84?=
 =?UTF-8?q?,=E6=9D=A1=E4=BB=B6=E7=9A=84=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/converter/json/SequenceFlowJsonConverter.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java
index 1f8ec241c..689426f12 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java
@@ -59,10 +59,10 @@ public class SequenceFlowJsonConverter extends AbstractBpmnJsonConverter<Sequenc
         StringBuilder sb = new StringBuilder("${");
         groups.forEach(group -> {
             String operator = "||";
-            if ("and".equals(nodeProperty.getGroupsType())) {
+            if ("and".equalsIgnoreCase(nodeProperty.getGroupsType())) {
                 operator = "&&";
             }
-            if (sb.indexOf(operator) > 0) {
+            if (sb.indexOf(operator) > 0 || sb.length() != 2) {
                 sb.append(" ").append(operator).append(" ");
             }
             StringBuilder conditionSb = new StringBuilder();
@@ -70,10 +70,10 @@ public class SequenceFlowJsonConverter extends AbstractBpmnJsonConverter<Sequenc
                 conditionSb.append("(");
                 group.getConditions().forEach(condition -> {
                     String conditionOperator = "||";
-                    if ("and".equals(group.getConditionsType())) {
+                    if ("and".equalsIgnoreCase(group.getConditionsType())) {
                         conditionOperator = "&&";
                     }
-                    if (conditionSb.indexOf(conditionOperator) > 0) {
+                    if (conditionSb.indexOf(conditionOperator) > 0 || conditionSb.length() != 1) {
                         conditionSb.append(" ").append(conditionOperator).append(" ");
                     }
                     conditionSb.append(parseConditions(condition));