From 5aa67a16c72095e35832f98f959e2d9bdbc12e9e Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Sun, 28 Apr 2024 13:15:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E7=8E=B0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/activerecord/query/WhereBuilder.java | 30 ++++++++++++++++++-
 .../core/query/QueryConditionBuilder.java     | 24 +++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
index 1d4b174f..c95cd4f6 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
@@ -16,7 +16,11 @@
 package com.mybatisflex.core.activerecord.query;
 
 import com.mybatisflex.core.constant.SqlConnector;
-import com.mybatisflex.core.query.*;
+import com.mybatisflex.core.query.CPI;
+import com.mybatisflex.core.query.Conditional;
+import com.mybatisflex.core.query.QueryColumn;
+import com.mybatisflex.core.query.QueryCondition;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.util.LambdaGetter;
 import com.mybatisflex.core.util.LambdaUtil;
 
@@ -473,6 +477,18 @@ public class WhereBuilder<R extends QueryModel<R>> implements Conditional<R> {
         return queryModel;
     }
 
+    @Override
+    public R between(Object[] values) {
+        addWhereQueryCondition(queryColumn.between(values));
+        return queryModel;
+    }
+
+    @Override
+    public R between(Object[] values, boolean isEffective) {
+        addWhereQueryCondition(queryColumn.between(values, isEffective));
+        return queryModel;
+    }
+
     /**
      * {@code NOT IN(value)}
      */
@@ -521,6 +537,18 @@ public class WhereBuilder<R extends QueryModel<R>> implements Conditional<R> {
         return queryModel;
     }
 
+    @Override
+    public R notBetween(Object[] values) {
+        addWhereQueryCondition(queryColumn.notBetween(values));
+        return queryModel;
+    }
+
+    @Override
+    public R notBetween(Object[] values, boolean isEffective) {
+        addWhereQueryCondition(queryColumn.notBetween(values, isEffective));
+        return queryModel;
+    }
+
     @Override
     public R notBetween(Object start, Object end) {
         addWhereQueryCondition(queryColumn.notBetween(start, end));
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
index 2bc6f107..0dfd17b4 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryConditionBuilder.java
@@ -443,6 +443,18 @@ public class QueryConditionBuilder<Wrapper extends QueryWrapper> implements Cond
         return this.queryWrapper;
     }
 
+    @Override
+    public Wrapper between(Object[] values) {
+        addWhereQueryCondition(queryColumn.between(values));
+        return queryWrapper;
+    }
+
+    @Override
+    public Wrapper between(Object[] values, boolean isEffective) {
+        addWhereQueryCondition(queryColumn.between(values, isEffective));
+        return queryWrapper;
+    }
+
     @Override
     public Wrapper between(Object start, Object end) {
         addWhereQueryCondition(queryColumn.between(start, end));
@@ -467,6 +479,18 @@ public class QueryConditionBuilder<Wrapper extends QueryWrapper> implements Cond
         return queryWrapper;
     }
 
+    @Override
+    public Wrapper notBetween(Object[] values) {
+        addWhereQueryCondition(queryColumn.notBetween(values));
+        return queryWrapper;
+    }
+
+    @Override
+    public Wrapper notBetween(Object[] values, boolean isEffective) {
+        addWhereQueryCondition(queryColumn.notBetween(values, isEffective));
+        return queryWrapper;
+    }
+
     @Override
     public Wrapper notBetween(Object start, Object end) {
         addWhereQueryCondition(queryColumn.notBetween(start, end));