Browse Source

fix(controller): 修复日期范围查询条件的空值判断逻辑

PIGCLOUD 3 weeks ago
parent
commit
966b2f2a0f
3 changed files with 9 additions and 3 deletions
  1. 3 1
      multiple/主子Contoller.java
  2. 3 1
      single/Controller.java
  3. 3 1
      tree/树形Controller.java

+ 3 - 1
multiple/主子Contoller.java

@@ -76,7 +76,9 @@ public class ${ClassName}Controller {
 #set($expression="Objects.nonNull")
 #end
 #if($field.queryFormType == 'daterange' || $field.queryFormType == 'datetimerange')
-		wrapper.between(ArrayUtil.isNotEmpty(${className}.${getAttrName}Range()),${ClassName}Entity::$getAttrName,${className}.${getAttrName}Range()[0],${className}.${getAttrName}Range()[1]);
+		if (ArrayUtil.isNotEmpty(${className}.${getAttrName}Range())) {
+            wrapper.between(${ClassName}Entity::$getAttrName, ${className}.${getAttrName}Range()[0], ${className}.${getAttrName}Range()[1]);
+        }
 #elseif($field.queryType == '=')
 		wrapper.eq($expression($var),${ClassName}Entity::$getAttrName,$var);
 #elseif( $field.queryType == 'like' )

+ 3 - 1
single/Controller.java

@@ -77,7 +77,9 @@ public class ${ClassName}Controller {
 #set($expression="Objects.nonNull")
 #end
 #if($field.queryFormType == 'daterange' || $field.queryFormType == 'datetimerange')
-		wrapper.between(ArrayUtil.isNotEmpty(${className}.${getAttrName}Range()),${ClassName}Entity::$getAttrName,${className}.${getAttrName}Range()[0],${className}.${getAttrName}Range()[1]);
+		if (ArrayUtil.isNotEmpty(${className}.${getAttrName}Range())) {
+            wrapper.between(${ClassName}Entity::$getAttrName, ${className}.${getAttrName}Range()[0], ${className}.${getAttrName}Range()[1]);
+        }
 #elseif($field.queryType == '=')
 		wrapper.eq($expression($var),${ClassName}Entity::$getAttrName,$var);
 #elseif( $field.queryType == 'like' )

+ 3 - 1
tree/树形Controller.java

@@ -75,7 +75,9 @@ public class ${ClassName}Controller {
 #set($expression="Objects.nonNull")
 #end
 #if($field.queryFormType == 'daterange' || $field.queryFormType == 'datetimerange')
-		wrapper.between(ArrayUtil.isNotEmpty(${className}.${getAttrName}Range()),${ClassName}Entity::$getAttrName,${className}.${getAttrName}Range()[0],${className}.${getAttrName}Range()[1]);
+		if (ArrayUtil.isNotEmpty(${className}.${getAttrName}Range())) {
+            wrapper.between(${ClassName}Entity::$getAttrName, ${className}.${getAttrName}Range()[0], ${className}.${getAttrName}Range()[1]);
+        }
 #elseif($field.queryType == '=')
 		wrapper.eq($expression($var),${ClassName}Entity::$getAttrName,$var);
 #elseif( $field.queryType == 'like' )