From 4ed513c7984b94e146f636c2616649dfccc6ea96 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 12 Jan 2023 15:55:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8):=20=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E5=92=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=90=8D=E7=A7=B0=E5=8D=87=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/ext/ExtDataSourceMapper.xml  |  2 +-
 .../dataease/service/datasource/DatasourceService.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
index f78b38b852..abb27c3635 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
@@ -125,7 +125,7 @@
             </if>
         </where>
         <if test="sort != null">
-            order by ${sort}
+            order by #{sort}
         </if>
     </select>
 
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index c575345cf7..900c9ef98d 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -158,9 +158,17 @@ public class DatasourceService {
     }
 
     public List<DatasourceDTO> getDatasourceList(DatasourceUnionRequest request) throws Exception {
-        request.setSort("type,name");
         List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
         datasourceDTOS.forEach(this::datasourceTrans);
+        if (StringUtils.isBlank(request.getSort())) {
+            datasourceDTOS.sort((o1,o2) -> {
+                int tmp = StringUtils.compareIgnoreCase(o1.getTypeDesc(), o2.getTypeDesc());
+                if (tmp == 0) {
+                    tmp = StringUtils.compareIgnoreCase(o1.getName(), o2.getName());
+                }
+                return tmp;
+            });
+        }
         return datasourceDTOS;
     }