From 20820b5eb0c7997218f2ebcff357725f9f2699bf Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 12 Aug 2021 14:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=8E=92=E8=A1=8C=E3=80=81?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=83=AD=E5=BF=83=E5=B8=82=E6=B0=91=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BA=EF=BC=9A=E5=85=88?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=80=BB=E7=A7=AF=E5=88=86=E9=99=8D=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=8C=89=E7=85=A7=E5=A7=93=E5=90=8D=E6=8B=BC?=
 =?UTF-8?q?=E9=9F=B3=E5=8D=87=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenPartyUserRankDataDao.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index 102b78296e..c336aa362d 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -15,7 +15,7 @@
             AND all_parent_ids LIKE CONCAT('%',#{agencyId},'%')
         ORDER BY
             point_total DESC,
-            user_name
+            convert(user_name using gbk) ASC
     </select>
 
 
@@ -129,7 +129,7 @@
                 and scg.AREA_CODE like CONCAT(#{areaCode},'%')
         ORDER BY
                 m.POINT_TOTAL DESC,
-                m.user_name
+                convert(m.user_name using gbk) ASC
     </select>
 
     <select id="selectAgencyResiPointListWithoutPartyMem"
@@ -169,7 +169,7 @@
             </if>
         </if>
         ORDER BY
-        u.point_total DESC
+        u.point_total DESC,convert(u.user_name using gbk) ASC
         LIMIT #{topNum}
     </select>