From 611e11ae23e961057bde65b724d0ca29762d6fbc Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 25 Jul 2022 19:14:33 +0800
Subject: [PATCH] 增加区间查询字段判断

---
 yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java | 4 ++--
 yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
index d9ba7c4..d387e28 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/LambdaQueryWrapperX.java
@@ -98,10 +98,10 @@ public class LambdaQueryWrapperX<T> extends LambdaQueryWrapper<T> {
         if (values!= null && values.length >0 && values[0] != null && values[1] != null) {
             return (LambdaQueryWrapperX<T>) super.between(column, values[0], values[1]);
         }
-        if (values != null && values[0] != null) {
+        if (values != null && values.length >0 && values[0] != null) {
             return (LambdaQueryWrapperX<T>) ge(column, values[0]);
         }
-        if (values != null && values[1] != null) {
+        if (values != null && values.length >0 && values[1] != null) {
             return (LambdaQueryWrapperX<T>) le(column, values[2]);
         }
         return this;
diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
index 1effb19..a443008 100644
--- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
+++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
@@ -95,13 +95,13 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
     }
 
     public QueryWrapperX<T> betweenIfPresent(String column, Object[] values) {
-        if (values!= null && values[0] != null && values[1] != null) {
+        if (values!= null && values.length != 0 && values[0] != null && values[1] != null) {
             return (QueryWrapperX<T>) super.between(column, values[0], values[1]);
         }
-        if (values!= null && values[0] != null) {
+        if (values!= null && values.length != 0 && values[0] != null) {
             return (QueryWrapperX<T>) ge(column, values[0]);
         }
-        if (values!= null && values[1] != null) {
+        if (values!= null && values.length != 0 && values[1] != null) {
             return (QueryWrapperX<T>) le(column, values[1]);
         }
         return this;
--
libgit2 0.21.4