diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
index 39827cd126..5b0001c1ac 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcVolunteerPolyDao.xml
@@ -45,8 +45,9 @@
                 AND c.VOLUNTEER_CATEGORY = #{code}
             </if>
             <if test="agencyId != null and agencyId != ''">
-                AND p.AGENCY_ID = #{agencyId}
+                AND (p.AGENCY_PIDS like '%${agencyId}%' OR p.AGENCY_ID = #{agencyId})
             </if>
+            group by u.id
         </where>
     </select>
     <select id="getList" resultType="com.epmet.dto.result.VolunteerPolyListResultDTO">
@@ -70,8 +71,9 @@
                 AND c.CUSTOMER_ID = #{customerId}
             </if>
             <if test="agencyId != null and agencyId != ''">
-                AND p.AGENCY_ID = #{agencyId}
+                AND p.AGENCY_PIDS like '%${agencyId}%' OR p.AGENCY_ID = #{agencyId}
             </if>
+            group by p.id
         </where>
     </select>
     <select id="getStatistics" resultType="com.epmet.dto.result.VolunteerPolyPieResultDTO">