From d94b5bf94cb5ffcb835d604a667666a2273cfdc4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Apr 2023 15:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8Fdc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcResiUserDao.xml    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index aa43c3eea9..ec82b7ce45 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -127,7 +127,12 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} is not null
                         and ${subCondition.tableName}.${subCondition.columnName} !=''
-                        and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
+                        <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                            and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                        </if>
+                        <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                            and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'notnull' ">
@@ -184,7 +189,12 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} is not null
                         and ${subCondition.tableName}.${subCondition.columnName} !=''
-                        and ${subCondition.tableName}.${subCondition.columnName} between #{subCondition.columnValue[0]} and #{subCondition.columnValue[1]}
+                        <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                            and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                        </if>
+                        <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                            and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                        </if>
                     </if>
 
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'notnull' ">