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

Browse Source
This commit is contained in:
地平线
2015-06-03 09:04:27 +08:00
parent cef789cafa
commit 0c613b5068
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/wentch/redkale/source/FilterBeanNode.java
View File

@@ -238,7 +238,11 @@ final class FilterBeanNode extends FilterNode {
@Override @Override
protected <T> Predicate<T> createFilterPredicate(final EntityInfo<T> info, FilterBean bean) { protected <T> Predicate<T> createFilterPredicate(final EntityInfo<T> info, FilterBean bean) {
if (this.joinSQL == null) return super.createFilterPredicate(info, bean); return createFilterPredicate(true, info, bean);
}
private <T> Predicate<T> createFilterPredicate(final boolean first, final EntityInfo<T> info, FilterBean bean) {
if ((this.joinSQL == null && first) || this.foreignEntity == null) return super.createFilterPredicate(info, bean);
final Map<EntityInfo, Predicate> foreign = new HashMap<>(); final Map<EntityInfo, Predicate> foreign = new HashMap<>();
Predicate<T> result = null; Predicate<T> result = null;
putForeignPredicate(foreign, bean); putForeignPredicate(foreign, bean);
@@ -246,7 +250,7 @@ final class FilterBeanNode extends FilterNode {
for (FilterNode n : this.nodes) { for (FilterNode n : this.nodes) {
FilterBeanNode node = (FilterBeanNode) n; FilterBeanNode node = (FilterBeanNode) n;
if (node.foreignEntity == null) { if (node.foreignEntity == null) {
Predicate<T> f = node.createFilterPredicate(info, bean); Predicate<T> f = node.createFilterPredicate(false, info, bean);
if (f == null) continue; if (f == null) continue;
result = (result == null) ? f : (signand ? result.and(f) : result.or(f)); result = (result == null) ? f : (signand ? result.and(f) : result.or(f));
} else { } else {
@@ -270,9 +274,10 @@ final class FilterBeanNode extends FilterNode {
} }
private void putForeignPredicate(final Map<EntityInfo, Predicate> foreign, FilterBean bean) { private void putForeignPredicate(final Map<EntityInfo, Predicate> foreign, FilterBean bean) {
if (this.foreignEntity == null) return;
final Serializable val = getValue(bean); final Serializable val = getValue(bean);
Predicate filter = (val == null && express != ISNULL && express != ISNOTNULL) ? ((t) -> signand) : super.createFilterPredicate(this.columnAttribute, val); Predicate filter = (val == null && express != ISNULL && express != ISNOTNULL) ? ((t) -> signand) : super.createFilterPredicate(this.columnAttribute, val);
if (filter == null || this.foreignEntity == null) return; if (filter == null) return;
Predicate p = foreign.get(this.foreignEntity); Predicate p = foreign.get(this.foreignEntity);
if (p == null) { if (p == null) {
foreign.put(foreignEntity, filter); foreign.put(foreignEntity, filter);