From e1c434b8543bc9b0ee094977268989706eaa97a5 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Sat, 20 Mar 2021 14:17:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6)?= =?UTF-8?q?=EF=BC=9A@Query=20=E5=8A=A0=E5=85=A5=20NOT=5FIN=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/zhengjie/annotation/Query.java | 2 ++ .../src/main/java/me/zhengjie/utils/QueryHelp.java | 9 +++++++-- 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 6f693ecf..e1758c9b 100644 --- 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 @@ public @interface Query { , 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 index 321b766d..69cb5e24 100644 --- 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 class QueryHelp { .as(String.class), val.toString() + "%")); break; case IN: - if (CollUtil.isNotEmpty((Collection)val)) { - list.add(getExpression(attributeName,join,root).in((Collection) val)); + if (CollUtil.isNotEmpty((Collection)val)) { + list.add(getExpression(attributeName,join,root).in((Collection) val)); + } + break; + case NOT_IN: + if (CollUtil.isNotEmpty((Collection)val)) { + list.add(getExpression(attributeName,join,root).in((Collection) val).not()); } break; case NOT_EQUAL: