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