lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
地平线
2015-10-26 18:05:02 +08:00
parent c87a26e439
commit 8fbc2b126c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/wentch/redkale/source/FilterNode.java
View File

@@ -220,9 +220,9 @@ 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 || column == null) return null; if (info == null || (column == null && this.nodes == null)) return null;
final Serializable val = getValue(bean); final Serializable val = getValue(bean);
Predicate<T> filter = val == null ? null : createFilterPredicate(info.getAttribute(column), val); Predicate<T> filter = (val == null || column == null) ? null : createFilterPredicate(info.getAttribute(column), val);
if (this.nodes == null) return filter; if (this.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);