From cef789cafa60f611a92fb280a9f05222c3b047f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E7=BA=BF?= <22250530@qq.com>
Date: Wed, 3 Jun 2015 08:46:26 +0800
Subject: [PATCH]

---
 src/com/wentch/redkale/source/FilterBeanNode.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/wentch/redkale/source/FilterBeanNode.java b/src/com/wentch/redkale/source/FilterBeanNode.java
index 1ba7c3db2..04096ed02 100644
--- a/src/com/wentch/redkale/source/FilterBeanNode.java
+++ b/src/com/wentch/redkale/source/FilterBeanNode.java
@@ -238,7 +238,7 @@ final class FilterBeanNode extends FilterNode {
 
     @Override
     protected <T> Predicate<T> createFilterPredicate(final EntityInfo<T> info, FilterBean bean) {
-        if (this.foreignEntity == null) return super.createFilterPredicate(info, bean);
+        if (this.joinSQL == null) return super.createFilterPredicate(info, bean);
         final Map<EntityInfo, Predicate> foreign = new HashMap<>();
         Predicate<T> result = null;
         putForeignPredicate(foreign, bean);
@@ -272,7 +272,7 @@ final class FilterBeanNode extends FilterNode {
     private void putForeignPredicate(final Map<EntityInfo, Predicate> foreign, FilterBean bean) {
         final Serializable val = getValue(bean);
         Predicate filter = (val == null && express != ISNULL && express != ISNOTNULL) ? ((t) -> signand) : super.createFilterPredicate(this.columnAttribute, val);
-        if (filter == null) return;
+        if (filter == null || this.foreignEntity == null) return;
         Predicate p = foreign.get(this.foreignEntity);
         if (p == null) {
             foreign.put(foreignEntity, filter);