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' ">