This commit is contained in:
@@ -204,8 +204,7 @@ public class FilterNode {
|
|||||||
protected <T> Predicate<T> createFilterPredicate(final EntityInfo<T> info, FilterBean bean) {
|
protected <T> Predicate<T> createFilterPredicate(final EntityInfo<T> info, FilterBean bean) {
|
||||||
if (info == null) return null;
|
if (info == null) return null;
|
||||||
final Serializable val = getValue(bean);
|
final Serializable val = getValue(bean);
|
||||||
if (val == null && express != ISNULL && express != ISNOTNULL) return null;
|
Predicate<T> filter = val == null ? null : createFilterPredicate(info.getAttribute(column), val);
|
||||||
Predicate<T> filter = createFilterPredicate(info.getAttribute(column), val);
|
|
||||||
if (nodes == null) return filter;
|
if (nodes == null) return filter;
|
||||||
for (FilterNode node : this.nodes) {
|
for (FilterNode node : this.nodes) {
|
||||||
Predicate<T> f = node.createFilterPredicate(info, bean);
|
Predicate<T> f = node.createFilterPredicate(info, bean);
|
||||||
|
|||||||
Reference in New Issue
Block a user