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

修复FilterBean对List<>不支持的BUG

Browse Source
This commit is contained in:
Redkale
2017-11-17 15:56:18 +08:00
parent 7200a74b18
commit a3dddd20c7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/redkale/source/FilterNodeBean.java
View File

@@ -63,7 +63,7 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
this.nodeBeans = bean == null ? null : bean.nodeBeans; this.nodeBeans = bean == null ? null : bean.nodeBeans;
} }
private FilterNodeBean(final FilterJoinColumn joinCol, final FilterColumn filterCol, final Attribute<T, Serializable> attr) { private FilterNodeBean(final FilterJoinColumn joinCol, final FilterColumn filterCol, final Attribute<T, Serializable> attr, final Type genericType) {
this.beanAttr = attr; this.beanAttr = attr;
this.joinClass = joinCol == null ? null : joinCol.table(); this.joinClass = joinCol == null ? null : joinCol.table();
this.joinColumns = joinCol == null ? null : joinCol.columns(); this.joinColumns = joinCol == null ? null : joinCol.columns();
@@ -72,8 +72,13 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
this.column = (filterCol != null && !filterCol.name().isEmpty()) ? filterCol.name() : attr.field(); this.column = (filterCol != null && !filterCol.name().isEmpty()) ? filterCol.name() : attr.field();
FilterExpress exp = filterCol == null ? null : filterCol.express(); FilterExpress exp = filterCol == null ? null : filterCol.express();
Class compType = type.getComponentType();
if (Collection.class.isAssignableFrom(type) && genericType instanceof ParameterizedType) {
Type pt = ((ParameterizedType) genericType).getActualTypeArguments()[0];
if (pt instanceof Class) compType = (Class) pt;
}
if ((exp == null || exp == EQUAL) && (type.isArray() || Collection.class.isAssignableFrom(type))) { if ((exp == null || exp == EQUAL) && (type.isArray() || Collection.class.isAssignableFrom(type))) {
if (type.getComponentType() != null && Range.class.isAssignableFrom(type.getComponentType())) { if (compType != null && Range.class.isAssignableFrom(compType)) {
if (AND != exp) exp = OR; if (AND != exp) exp = OR;
} else if (NOTIN != exp) { } else if (NOTIN != exp) {
exp = IN; exp = IN;
@@ -189,7 +194,7 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
fields.add(field.getName()); fields.add(field.getName());
final Attribute<T, Serializable> beanAttr = pubmod ? Attribute.create(field) : Attribute.create(getter, null); final Attribute<T, Serializable> beanAttr = pubmod ? Attribute.create(field) : Attribute.create(getter, null);
FilterNodeBean<T> nodeBean = new FilterNodeBean(field.getAnnotation(FilterJoinColumn.class), field.getAnnotation(FilterColumn.class), beanAttr); FilterNodeBean<T> nodeBean = new FilterNodeBean(field.getAnnotation(FilterJoinColumn.class), field.getAnnotation(FilterColumn.class), beanAttr, field.getGenericType());
//------------------------------------ //------------------------------------
{ {