Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop

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

@@ -630,7 +630,7 @@
         WHERE 1=1
         <if test="level != null and level != ''">
              <if test="level=='agency'">
-                AND (CONCAT(PIDS, ':', agency_id) like  CONCAT(#{id},':%'))
+                AND (CONCAT(PIDS, agency_id) like  CONCAT(#{id},'%'))
             </if>
             <if test="level=='grid'">
                 AND GRID_ID = #{id}