bug修改

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java

@@ -343,7 +343,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         if (volunteerRes.success() && CollectionUtils.isNotEmpty(volunteerRes.getData())) {
             resultList = ConvertUtils.sourceToTarget(volunteerRes.getData(), OptionDTO.class);
             resultList = resultList.stream().sorted((o1, o2) ->
-                            Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLabel(),o2.getLabel()))
+                            Collator.getInstance(Locale.SIMPLIFIED_CHINESE).compare(o1.getLabel(),o2.getLabel()))
                                 .collect(Collectors.toList());
         }
         return resultList;

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

@@ -81,7 +81,7 @@
                 AND c.CUSTOMER_ID = #{customerId}
             </if>
             <if test="agencyId != null and agencyId != ''">
-                AND p.AGENCY_ID = #{agencyId} OR p.AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' )
+                AND (p.AGENCY_ID = #{agencyId} OR p.AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' ))
             </if>
             group by p.id
         </where>