[代码优化](v2.5): @query 加入 INNER 查询

close elunez#415
dwc361 · Jun 21, 2020 · 73eb350 · 73eb350
1 parent a24d4f7
commit 73eb350
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -80,8 +80,8 @@ enum Type {
      * 适用于简单连接查询，复杂的请自定义该注解，或者使用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
@@ -100,6 +100,13 @@ public static <R, Q> Predicate getPredicate(Root<R> root, Q query, CriteriaBuild
                                         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;
                             }
                         }