From b196fbb5611e0e5b067fbc3bfb4e84ffeff985f6 Mon Sep 17 00:00:00 2001
From: Michael Yang <fuhai999@gmail.com>
Date: Mon, 14 Jul 2025 13:05:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20between=20?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=81=87=E5=88=B0=20=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=BA=20null=20=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=BD=AC=E6=8D=A2=E6=88=90=20LE=20=E6=88=96=20GE=20?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=20close=20#ICKPDB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/core/query/QueryColumn.java   | 47 +++++++++++++------
 .../core/query/QueryColumnBehavior.java       | 15 +++++-
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
index e6943642..3ac6f5a6 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
@@ -513,18 +513,37 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
         if (values == null || values.length != 2) {
             throw new IllegalArgumentException("values is null or length is not 2");
         }
-        return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, values));
+        Object start = values[0], end = values[1];
+        return between_(start, end);
     }
 
     QueryCondition between_(Object start, Object end) {
+        if (start == null && end == null) {
+            return QueryCondition.createEmpty();
+        }
+
+        boolean smartConvertBetweenToLeOrGe = QueryColumnBehavior.isSmartConvertBetweenToLeOrGe();
+        if ((start == null || end == null) && !smartConvertBetweenToLeOrGe) {
+            return QueryCondition.createEmpty();
+        }
+
+        /* && end != null */
+        if (start == null) {
+            return le_(end);
+        }
+
+        /* && start != null */
+        if (end == null) {
+            return ge_(start);
+        }
         return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}));
     }
 
     @Override
     public QueryCondition between(Object[] values) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
-            return QueryCondition.createEmpty();
-        }
+//        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
+//            return QueryCondition.createEmpty();
+//        }
         return between_(values);
     }
 
@@ -538,9 +557,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition between(Object start, Object end) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
-        }
+//        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
+//            return QueryCondition.createEmpty();
+//        }
         return between_(start, end);
     }
 
@@ -576,9 +595,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notBetween(Object[] values) {
-        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
-            return QueryCondition.createEmpty();
-        }
+//        if (QueryColumnBehavior.shouldIgnoreValue(values)) {
+//            return QueryCondition.createEmpty();
+//        }
         return notBetween_(values);
     }
 
@@ -592,9 +611,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
 
     @Override
     public QueryCondition notBetween(Object start, Object end) {
-        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
-            return QueryCondition.createEmpty();
-        }
+//        if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
+//            return QueryCondition.createEmpty();
+//        }
         return notBetween_(start, end);
     }
 
@@ -892,7 +911,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
     }
 
 
-    ////order by ////
+    /// /order by ////
     public QueryOrderBy asc() {
         return new QueryOrderBy(this, SqlConsts.ASC);
     }
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumnBehavior.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumnBehavior.java
index 99f78019..ddba68f3 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumnBehavior.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumnBehavior.java
@@ -94,7 +94,12 @@ public class QueryColumnBehavior {
     /**
      * 当 {@code IN(...)} 条件只有 1 个参数时，是否自动把的内容转换为相等。
      */
-    private static boolean smartConvertInToEquals = false;
+    private static boolean smartConvertInToEquals = true;
+
+    /**
+     * 当 {@code BETWEEN ... AND ...} 条件只有 1 个参数时，是否自动把的内容转换为小于等于或大于等于。
+     */
+    private static boolean smartConvertBetweenToLeOrGe = true;
 
     public static Predicate<Object> getIgnoreFunction() {
         return ignoreFunction;
@@ -112,6 +117,14 @@ public class QueryColumnBehavior {
         QueryColumnBehavior.smartConvertInToEquals = smartConvertInToEquals;
     }
 
+    public static boolean isSmartConvertBetweenToLeOrGe() {
+        return smartConvertBetweenToLeOrGe;
+    }
+
+    public static void setSmartConvertBetweenToLeOrGe(boolean smartConvertBetweenToLeOrGe) {
+        QueryColumnBehavior.smartConvertBetweenToLeOrGe = smartConvertBetweenToLeOrGe;
+    }
+
     static boolean shouldIgnoreValue(Object value) {
         return ignoreFunction.test(value);
     }