From 73eb350172ac99e589a23d0ae8cc60560b3630f3 Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Sun, 21 Jun 2020 17:49:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.5):?=
 =?UTF-8?q?=20@Query=20=E5=8A=A0=E5=85=A5=20INNER=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close https://github.com/elunez/eladmin/issues/415
---
 .../src/main/java/me/zhengjie/annotation/Query.java        | 4 ++--
 .../src/main/java/me/zhengjie/utils/QueryHelp.java         | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
index c5bbcca6..6f693ecf 100644
--- a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
+++ b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
@@ -80,8 +80,8 @@ public @interface Query {
      * 适用于简单连接查询，复杂的请自定义该注解，或者使用sql查询
      */
     enum Join {
-        /** jie 2019-6-4 13:18:30 左右连接 */
-        LEFT, RIGHT
+        /** jie 2019-6-4 13:18:30 */
+        LEFT, RIGHT, INNER
     }
 
 }
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 cc998084..321b766d 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
@@ -100,6 +100,13 @@ public class QueryHelp {
                                         join = root.join(name, JoinType.RIGHT);
                                     }
                                     break;
+                                case INNER:
+                                    if(ObjectUtil.isNotNull(join) && ObjectUtil.isNotNull(val)){
+                                        join = join.join(name, JoinType.INNER);
+                                    } else {
+                                        join = root.join(name, JoinType.INNER);
+                                    }
+                                    break;
                                 default: break;
                             }
                         }