[代码优化](v2.6)：@query 加入 NOT_IN 查询

gitbruce · Mar 20, 2021 · e1c434b · e1c434b
1 parent 8c6571f
commit e1c434b
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
@@ -65,6 +65,8 @@ enum Type {
         , LESS_THAN_NQ
         // jie 2019/6/4 包含
         , IN
+        // 不包含
+        , NOT_IN
         // 不等于
         ,NOT_EQUAL
         // between

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
@@ -141,8 +141,13 @@ public static <R, Q> Predicate getPredicate(Root<R> root, Q query, CriteriaBuild
                                     .as(String.class), val.toString() + "%"));
                             break;
                         case IN:
-                            if (CollUtil.isNotEmpty((Collection<Long>)val)) {
-                                list.add(getExpression(attributeName,join,root).in((Collection<Long>) val));
+                            if (CollUtil.isNotEmpty((Collection<Object>)val)) {
+                                list.add(getExpression(attributeName,join,root).in((Collection<Object>) val));
+                            }
+                            break;
+                        case NOT_IN:
+                            if (CollUtil.isNotEmpty((Collection<Object>)val)) {
+                                list.add(getExpression(attributeName,join,root).in((Collection<Object>) val).not());
                             }
                             break;
                         case NOT_EQUAL: