From 7e89ab96023e68f54cf9311b983ad1b82e0642cb Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 16 Jun 2022 16:54:01 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/VolunteerInfoServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/IcVolunteerPolyDao.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index c7d4d6139a..b57b386a8f 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/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;
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 68439048b8..6c5066bbe0 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
@@ -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>