修改：

1.居民搜索，keyword条件sql位置调整

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -51,13 +51,6 @@
         <if test="resultTableName != null and resultTableName != ''">
             AND ${resultTableName}.ID IS NOT NULL
         </if>
-        <if test="keyword != null and keyword != ''">
-            AND (
-                NAME = #{keyword}
-                or MOBILE = #{keyword}
-                or ID_CARD = #{keyword}
-                )
-        </if>
         and ic_resi_user.customer_id=#{customerId}
         and (ic_resi_user.AGENCY_ID =#{currentStaffAgencyId} or ic_resi_user.pids like concat(#{staffOrgPath},'%'))
         <if test="null != conditions and conditions.size() > 0">
@@ -129,6 +122,13 @@
         </if>
         <where>
             <include refid="listWhereForPage"></include>
+            <if test="keyword != null and keyword != ''">
+                AND (
+                NAME = #{keyword}
+                or MOBILE = #{keyword}
+                or ID_CARD = #{keyword}
+                )
+            </if>
         </where>
         group by IC_RESI_USER.id
         order by ic_resi_user.CREATED_TIME desc