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 9b30ddb1a8..f94e97f38a 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,11 +127,34 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} is not null
                         and ${subCondition.tableName}.${subCondition.columnName} !=''
-                        <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <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='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                        </if>
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                            <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
+                            </if>
+                        </if>
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
                         </if>
                     </if>
 
@@ -189,11 +212,34 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} is not null
                         and ${subCondition.tableName}.${subCondition.columnName} !=''
-                        <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <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.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                        </if>
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                            <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
+                            </if>
                         </if>
-                        <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
                         </if>
                     </if>