diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
index 2e572d0578..f78b38b852 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
@@ -124,7 +124,7 @@
                 and configuration = #{configuration,jdbcType=LONGVARCHAR}
             </if>
         </where>
-        <if test="sort == null">
+        <if test="sort != null">
             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 b867ebed3c..c575345cf7 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -158,11 +158,9 @@ public class DatasourceService {
     }
 
     public List<DatasourceDTO> getDatasourceList(DatasourceUnionRequest request) throws Exception {
-        request.setSort("update_time desc");
+        request.setSort("type,name");
         List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
-        datasourceDTOS.forEach(datasourceDTO -> {
-            datasourceTrans(datasourceDTO);
-        });
+        datasourceDTOS.forEach(this::datasourceTrans);
         return datasourceDTOS;
     }
 
diff --git a/frontend/src/views/system/relationship/index.vue b/frontend/src/views/system/relationship/index.vue
index 11e3b7e977..0bf4fd23be 100644
--- a/frontend/src/views/system/relationship/index.vue
+++ b/frontend/src/views/system/relationship/index.vue
@@ -39,6 +39,7 @@
             placement="bottom"
             trigger="manual"
             :width="popoverSize"
+            popper-class="relation-popover"
           >
             <el-tree
               v-show="showTree"
@@ -630,4 +631,8 @@ export default {
   /*display: inline;*/
   visibility: visible;
 }
+.relation-popover {
+  max-height: 100%;
+  overflow-y: scroll;
+}
 </style>