Merge remote-tracking branch 'origin/dev_renhu'

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -160,7 +160,8 @@
             AND a.DEL_FLAG = '0'
 
         </where>
-        ORDER BY CAST(a.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
+        ORDER BY a.GRID_ID asc,
+            CAST(a.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select

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

@@ -201,9 +201,9 @@
             <include refid="listWhereForPage"></include>
             <if test="keyword != null and keyword != ''">
                 AND (
-                NAME = #{keyword}
+                NAME like concat('%', #{keyword},'%')
-                or MOBILE = #{keyword}
+                or MOBILE like concat('%', #{keyword},'%')
-                or ID_CARD = #{keyword}
+                or ID_CARD like concat('%', #{keyword},'%')
                 )
             </if>
         </where>