From f5e4779f1de81e864cba217c3504f3bf7439cd85 Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Mon, 23 May 2022 13:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcVolunteerPolyDao.xml        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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">