From bc0863dd18ed6cf354e3d0205be365cafcd5df46 Mon Sep 17 00:00:00 2001
From: Jianguo-Genius <herman.song.yang@gmail.com>
Date: Sat, 14 Sep 2024 17:19:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95=E5=AF=BC=E5=87=BA=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml  | 2 +-
 .../api/service/definition/ApiDefinitionExportService.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
index e483b06cd3..46f51df0fc 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDefinitionMapper.xml
@@ -107,7 +107,7 @@
         </if>
         <include refid="queryWhereConditionByBaseQueryRequest"/>
         <if test="orderColumns != null">
-            ORDER BY #{orderColumns}
+            ORDER BY ${orderColumns}
         </if>
     </select>
 
diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
index db28b822db..c8b7931b5c 100644
--- a/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
+++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionExportService.java
@@ -209,7 +209,8 @@ public class ApiDefinitionExportService {
         }
 
         if (request.isSelectAll()) {
-            List<String> ids = extApiDefinitionMapper.getIdsBySort(request, request.getProjectId(), protocols, request.getSortString());
+            String sortString = StringUtils.isBlank(request.getSortString()) ? "pos desc,id desc" : request.getSortString();
+            List<String> ids = extApiDefinitionMapper.getIdsBySort(request, request.getProjectId(), protocols, sortString);
             if (CollectionUtils.isNotEmpty(request.getExcludeIds())) {
                 ids.removeAll(request.getExcludeIds());
             }