fix Filter

xlorne · xlorne · commit e33afcc505c4 · 2023-10-28T00:32:36.000+08:00
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/query/QueryRequest.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/query/QueryRequest.java
@@ -168,7 +168,10 @@ private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder
                 Filter[] orFilters = (Filter[]) filter.getValue();
                 List<Predicate> orPredicates = new ArrayList<>();
                 for (Filter orFilter : orFilters) {
-                    orPredicates.add(toPredicate(orFilter, criteriaBuilder, root, properties));
+                    Predicate predicate = toPredicate(orFilter, criteriaBuilder, root, properties);
+                    if (predicate != null) {
+                        orPredicates.add(predicate);
+                    }
                 }
                 return criteriaBuilder.or(orPredicates.toArray(new Predicate[0]));
             }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,10 @@ private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder`
`168`	`168`	`Filter[] orFilters = (Filter[]) filter.getValue();`
`169`	`169`	`List<Predicate> orPredicates = new ArrayList<>();`
`170`	`170`	`for (Filter orFilter : orFilters) {`
`171`		`- orPredicates.add(toPredicate(orFilter, criteriaBuilder, root, properties));`
	`171`	`+ Predicate predicate = toPredicate(orFilter, criteriaBuilder, root, properties);`
	`172`	`+ if (predicate != null) {`
	`173`	`+ orPredicates.add(predicate);`
	`174`	`+ }`
`172`	`175`	`}`
`173`	`176`	`return criteriaBuilder.or(orPredicates.toArray(new Predicate[0]));`
`174`	`177`	`}`