Skip to content

Commit f2777e1

Browse files
committed
fix Filter
1 parent de19601 commit f2777e1

File tree

1 file changed

+7
-4
lines changed
  • springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/query

1 file changed

+7
-4
lines changed

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/query/QueryRequest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import com.codingapi.springboot.framework.dto.request.Filter;
55
import com.codingapi.springboot.framework.dto.request.PageRequest;
66
import com.codingapi.springboot.framework.dto.request.RequestFilter;
7+
import org.springframework.beans.BeanUtils;
8+
import org.springframework.data.domain.Example;
9+
710
import javax.persistence.criteria.CriteriaBuilder;
811
import javax.persistence.criteria.Order;
912
import javax.persistence.criteria.Predicate;
1013
import javax.persistence.criteria.Root;
11-
import org.springframework.beans.BeanUtils;
12-
import org.springframework.data.domain.Example;
13-
1414
import java.beans.PropertyDescriptor;
1515
import java.util.ArrayList;
1616
import java.util.Date;
@@ -169,7 +169,10 @@ private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder
169169
Filter[] orFilters = (Filter[]) filter.getValue();
170170
List<Predicate> orPredicates = new ArrayList<>();
171171
for (Filter orFilter : orFilters) {
172-
orPredicates.add(toPredicate(orFilter, criteriaBuilder, root, properties));
172+
Predicate predicate = toPredicate(orFilter, criteriaBuilder, root, properties);
173+
if (predicate != null) {
174+
orPredicates.add(predicate);
175+
}
173176
}
174177
return criteriaBuilder.or(orPredicates.toArray(new Predicate[0]));
175178
}

0 commit comments

Comments
 (0)