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