From a623acd4a5529ae42898ec359f595716acc5bab8 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 21:31:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B3=A8=E8=A7=A3=E8=A7=A3=E6=9E=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/util/helper/QueryHelper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java index 5c5371d1..70871873 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/QueryHelper.java @@ -142,7 +142,8 @@ public class QueryHelper { String property = queryAnnotation.property(); fieldName = StrUtil.blankToDefault(property, fieldName); String columnName = StrUtil.toUnderlineCase(fieldName); - switch (queryAnnotation.type()) { + Query.Type queryType = queryAnnotation.type(); + switch (queryType) { case EQUAL: queryWrapper.eq(columnName, fieldValue); break; @@ -163,7 +164,9 @@ public class QueryHelper { break; case BETWEEN: List between = new ArrayList<>((List)fieldValue); - queryWrapper.between(columnName, between.get(0), between.get(1)); + if (between.size() >= 2) { + queryWrapper.between(columnName, between.get(0), between.get(1)); + } break; case LEFT_LIKE: queryWrapper.likeLeft(columnName, fieldValue); @@ -191,7 +194,7 @@ public class QueryHelper { queryWrapper.isNotNull(columnName); break; default: - break; + throw new IllegalArgumentException(String.format("暂不支持 [%s] 查询类型", queryType)); } } }