From a3dddd20c770307b92c344d0b087349c50dbae02 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Fri, 17 Nov 2017 15:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DFilterBean=E5=AF=B9List<>?=
 =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/source/FilterNodeBean.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/org/redkale/source/FilterNodeBean.java b/src/org/redkale/source/FilterNodeBean.java
index 6531797a9..068410e4e 100644
--- a/src/org/redkale/source/FilterNodeBean.java
+++ b/src/org/redkale/source/FilterNodeBean.java
@@ -63,7 +63,7 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
         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.joinClass = joinCol == null ? null : joinCol.table();
         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();
 
         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 (type.getComponentType() != null && Range.class.isAssignableFrom(type.getComponentType())) {
+            if (compType != null && Range.class.isAssignableFrom(compType)) {
                 if (AND != exp) exp = OR;
             } else if (NOTIN != exp) {
                 exp = IN;
@@ -189,7 +194,7 @@ public final class FilterNodeBean<T extends FilterBean> implements Comparable<Fi
                 fields.add(field.getName());
 
                 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());
 
                 //------------------------------------
                 {