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 4839f96d5a..c0a5d5ad33 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
@@ -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>