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

Browse Source
This commit is contained in:
RedKale
2016-03-15 16:00:38 +08:00
parent 9ed7844c2e
commit 669ab81b0f
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/redkale/source/FilterNodeBean.java
View File

@@ -5,12 +5,12 @@
*/
package org.redkale.source;
import static org.redkale.source.FilterExpress.*;
import java.io.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.*;
import javax.persistence.*;
import static org.redkale.source.FilterExpress.*;
import org.redkale.util.*;
/**
@@ -47,16 +47,16 @@ public final class FilterNodeBean<T> implements Comparable<FilterNodeBean<T>> {
private boolean number;
public FilterNodeBean(FilterNodeBean bean) {
this.beanAttr = bean.beanAttr;
this.column = bean.column;
this.express = bean.express;
this.joinClass = bean.joinClass;
this.joinColumns = bean.joinColumns;
this.least = bean.least;
this.string = bean.string;
this.number = bean.number;
this.or = bean.or;
this.nodeBeans = bean.nodeBeans;
this.beanAttr = bean == null ? null : bean.beanAttr;
this.column = bean == null ? null : bean.column;
this.express = bean == null ? null : bean.express;
this.joinClass = bean == null ? null : bean.joinClass;
this.joinColumns = bean == null ? null : bean.joinColumns;
this.least = bean == null ? 1 : bean.least;
this.string = bean == null ? false : bean.string;
this.number = bean == null ? false : bean.number;
this.or = bean == null ? false : bean.or;
this.nodeBeans = bean == null ? null : bean.nodeBeans;
}
private FilterNodeBean(final FilterJoinColumn joinCol, final FilterColumn filterCol, final Attribute<T, Serializable> attr) {
@@ -128,7 +128,7 @@ public final class FilterNodeBean<T> implements Comparable<FilterNodeBean<T>> {
}
private FilterNode create(final T bean) {
if (bean == null) return null;
if (bean == null || beanAttr == null) return null;
FilterNode node = null;
final Serializable val = beanAttr.get(bean);
if (column != null && val != null) {
@@ -221,8 +221,8 @@ public final class FilterNodeBean<T> implements Comparable<FilterNodeBean<T>> {
if (f == null) continue;
rs = rs == null ? f : rs.and(f);
}
if (rs.nodeBeans != null) Arrays.sort(rs.nodeBeans);
return rs;
if (rs !=null && rs.nodeBeans != null) Arrays.sort(rs.nodeBeans);
return rs == null ? new FilterNodeBean(null) : rs;
}
@Override