Browse Source

Merge branch '1.0' into 1.1

caixiaofeng 7 months ago
parent
commit
039b2c3b50

+ 5 - 1
flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/ConditionNode.java

@@ -84,7 +84,11 @@ public class ConditionNode extends Node {
                     .stream()
                     .map(this::toExpression)
                     .collect(Collectors.joining("and".equals(filterGroup.getOperator()) ? " && " : " || "));
-            return String.format("(%s) %s (%s)", expression, "and".equals(filterGroup.getOperator()) ? " && " : " || ", collect);
+            if (StringUtils.isNotBlank(expression)) {
+                return String.format("(%s) %s (%s)", expression, "and".equals(filterGroup.getOperator()) ? " && " : " || ", collect);
+            } else {
+                return collect;
+            }
         }
     }