Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange

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

@@ -97,7 +97,7 @@
             p.CUSTOMER_ID = #{customerId} and c.VOLUNTEER_CATEGORY is not null
         AND
             c.VOLUNTEER_CATEGORY != ''
-        AND p.AGENCY_ID = #{agencyId}
+        AND ( p.AGENCY_ID = #{agencyId} or p.AGENCY_PIDS like '%${agencyId}%' )
         AND p.del_flag = '0'
         GROUP BY
             c.VOLUNTEER_CATEGORY
@@ -108,4 +108,4 @@
     <delete id="deleteCategoryByCustomerId">
         delete from ic_volunteer_poly_category where CUSTOMER_ID = #{customerId}
     </delete>
-</mapper>
+</mapper>