From 1f856a1d4bb2104bc4d81aa339b8679eb3b86b96 Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Fri, 3 Apr 2020 22:01:06 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8DQueryHelp::getPredica?=
 =?UTF-8?q?te=E6=9F=A5=E8=AF=A2=E4=BC=9A=E4=BA=A7=E7=94=9F=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84Join?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
index c42a514e..b00b53d8 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
@@ -56,14 +56,14 @@ public class QueryHelp {
                         for (String name : joinNames) {
                             switch (q.join()) {
                                 case LEFT:
-                                    if(ObjectUtil.isNotNull(join)){
+                                    if(ObjectUtil.isNotNull(join) && ObjectUtil.isNotNull(val)){
                                         join = join.join(name, JoinType.LEFT);
                                     } else {
                                         join = root.join(name, JoinType.LEFT);
                                     }
                                     break;
                                 case RIGHT:
-                                    if(ObjectUtil.isNotNull(join)){
+                                    if(ObjectUtil.isNotNull(join) && ObjectUtil.isNotNull(val)){
                                         join = join.join(name, JoinType.RIGHT);
                                     } else {
                                         join = root.join(name, JoinType.RIGHT);