瀏覽代碼

Merge branch '1.1'

caixiaofeng 7 月之前
父節點
當前提交
2a3806552f

+ 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;
+            }
         }
     }