Commit 611e11ae23e961057bde65b724d0ca29762d6fbc

Authored by xingyu
1 parent 54efb342

增加区间查询字段判断

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> { @@ -98,10 +98,10 @@ public class LambdaQueryWrapperX<T> extends LambdaQueryWrapper<T> {
98 if (values!= null && values.length >0 && values[0] != null && values[1] != null) { 98 if (values!= null && values.length >0 && values[0] != null && values[1] != null) {
99 return (LambdaQueryWrapperX<T>) super.between(column, values[0], values[1]); 99 return (LambdaQueryWrapperX<T>) super.between(column, values[0], values[1]);
100 } 100 }
101 - if (values != null && values[0] != null) { 101 + if (values != null && values.length >0 && values[0] != null) {
102 return (LambdaQueryWrapperX<T>) ge(column, values[0]); 102 return (LambdaQueryWrapperX<T>) ge(column, values[0]);
103 } 103 }
104 - if (values != null && values[1] != null) { 104 + if (values != null && values.length >0 && values[1] != null) {
105 return (LambdaQueryWrapperX<T>) le(column, values[2]); 105 return (LambdaQueryWrapperX<T>) le(column, values[2]);
106 } 106 }
107 return this; 107 return this;
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&lt;T&gt; extends QueryWrapper&lt;T&gt; { @@ -95,13 +95,13 @@ public class QueryWrapperX&lt;T&gt; extends QueryWrapper&lt;T&gt; {
95 } 95 }
96 96
97 public QueryWrapperX<T> betweenIfPresent(String column, Object[] values) { 97 public QueryWrapperX<T> betweenIfPresent(String column, Object[] values) {
98 - if (values!= null && values[0] != null && values[1] != null) { 98 + if (values!= null && values.length != 0 && values[0] != null && values[1] != null) {
99 return (QueryWrapperX<T>) super.between(column, values[0], values[1]); 99 return (QueryWrapperX<T>) super.between(column, values[0], values[1]);
100 } 100 }
101 - if (values!= null && values[0] != null) { 101 + if (values!= null && values.length != 0 && values[0] != null) {
102 return (QueryWrapperX<T>) ge(column, values[0]); 102 return (QueryWrapperX<T>) ge(column, values[0]);
103 } 103 }
104 - if (values!= null && values[1] != null) { 104 + if (values!= null && values.length != 0 && values[1] != null) {
105 return (QueryWrapperX<T>) le(column, values[1]); 105 return (QueryWrapperX<T>) le(column, values[1]);
106 } 106 }
107 return this; 107 return this;