From 483bd8f0b1b19b3edc7f7730eab082f37179419a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 24 Nov 2021 18:42:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=A0=91=E5=BD=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E6=8B=BC=E9=9F=B3?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml | 5 +----
 .../java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml  | 5 +----
 .../io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml    | 4 +---
 .../io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml    | 4 +---
 .../java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml | 4 ++--
 .../java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml | 1 +
 frontend/src/api/authModel/authModel.js                      | 1 +
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
index 92b95a8832..61ec2c7881 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.xml
@@ -75,10 +75,7 @@
                 </foreach>
             </if>
         </where>
-        <if test="sort != null">
-            order by ${sort}
-        </if>
-
+        ORDER BY CONVERT(`name` using gbk)
 
     </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
index e508578fa4..6ce255571d 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
@@ -74,10 +74,7 @@
                 and name like CONCAT('%', #{name},'%')
             </if>
         </where>
-        <if test="sort != null">
-            order by ${sort}
-        </if>
-
+        ORDER BY CONVERT(`name` using gbk)
 
     </select>
 
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
index cd4fe2976d..02267d4f1e 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetGroupMapper.xml
@@ -75,9 +75,7 @@
                 </foreach>
             </if>
         </where>
-        <if test="sort != null">
-            order by ${sort}
-        </if>
+        ORDER BY CONVERT(`name` using gbk)
     </select>
 
     <select id="searchIds" resultType="java.util.Map">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
index 230f89883c..e07d805520 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
@@ -92,8 +92,6 @@
                 </foreach>
             </if>
         </where>
-        <if test="sort != null">
-            order by ${sort}
-        </if>
+        ORDER BY CONVERT(`name` using gbk)
     </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
index 5e2049d067..12ea8b17aa 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
@@ -86,7 +86,7 @@
                 and panel_group.level = #{level}
             </if>
         </where>
-        order by panel_group.name asc,panel_group.create_time desc
+        ORDER BY CONVERT(panel_group.name using gbk)
     </select>
 
     <select id="panelGroupList" resultMap="BaseResultMapDTO">
@@ -160,7 +160,7 @@
                 and panel_group.level = #{level}
             </if>
         </where>
-        order by panel_group.name asc,panel_group.create_time desc
+     ORDER BY CONVERT(panel_group.name using gbk)
     </select>
 
     <delete id="deleteCircle">
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
index 4eb2628626..50893b454d 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
@@ -54,6 +54,7 @@
 		) authInfo ON v_auth_model.id = authInfo.auth_source
 	WHERE
 		FIND_IN_SET( v_auth_model.id, cids )
+		ORDER BY CONVERT(v_auth_model.label using gbk) asc
   </select>
 
 </mapper>
diff --git a/frontend/src/api/authModel/authModel.js b/frontend/src/api/authModel/authModel.js
index 48407397f5..33ba79f0a2 100644
--- a/frontend/src/api/authModel/authModel.js
+++ b/frontend/src/api/authModel/authModel.js
@@ -5,6 +5,7 @@ export function queryAuthModel(data) {
     url: 'authModel/queryAuthModel',
     method: 'post',
     loading: true,
+    timeout: 30000,
     data
   })
 }