From 6c50acb57c29bf046bf2a3cf142137697da836b0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 29 Nov 2022 15:03:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/DataSyncConfigDao.xml    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
index 7b0e96f023..ea80141610 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
@@ -31,26 +31,26 @@
     </resultMap>
     <select id="list" resultMap="dataConfigList">
         SELECT
-            ID AS id,
-            DEPT_CODE AS deptCode,
-            DEPT_NAME AS deptName,
-            DATA_NAME AS dataName,
-            switch_status AS switchStatus,
-            sort AS sort,
-            data_code AS dataCode,
-            customer_id as customerId
-        FROM data_sync_config
-        WHERE DEL_FLAG = 0
+            c.ID AS id,
+            c.DEPT_CODE AS deptCode,
+            c.DEPT_NAME AS deptName,
+            c.DATA_NAME AS dataName,
+            c.switch_status AS switchStatus,
+            c.sort AS sort,
+            c.data_code AS dataCode,
+            c.customer_id as customerId
+        FROM data_sync_config c
+        WHERE c.DEL_FLAG = 0
         <if test="switchStatus != null and switchStatus != ''">
-            AND switch_status = #{switchStatus}
+            AND c.switch_status = #{switchStatus}
         </if>
         <if test='null != customerId and customerId != "" '>
-            AND CUSTOMER_ID = #{customerId}
+            AND c.CUSTOMER_ID = #{customerId}
         </if>
         <if test="dataCode != null and dataCode != ''">
-            AND data_code = #{dataCode}
+            AND c.data_code = #{dataCode}
         </if>
-        order by sort
+        order by CONVERT(c.DEPT_NAME USING gbk),c.sort asc
     </select>
 
     <!-- 范围查询 -->