Merge branch 'dev_ic_platform' into develop

4 years ago · 32a54b6286
1 changed files with 1 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@ -187,7 +187,7 @@
            GRID_ID
        FROM ic_resi_user
        WHERE DEL_FLAG = '0'
-          AND PIDS LIKE CONCAT('%',#{agencyId},'%')
+          AND (AGENCY_ID = #{agencyId} OR PIDS LIKE CONCAT('%',#{agencyId},'%'))
          AND `NAME` LIKE CONCAT('%',#{name},'%')
        ORDER BY `NAME`
    </select>