From 043cafbf6a492f2f94adc0e546d1e7d7450fab6b Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Sun, 18 Sep 2022 15:21:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=BC=95=E7=94=A8=E5=88=97=E8=A1=A8ID=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/base/mapper/UiScenarioReferenceMapper.xml  | 7 +++++++
 backend/src/main/java/io/metersphere/xpack                 | 2 +-
 frontend/src/business/components/xpack                     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
index 9ea1a27ab3..ff4ff9f7d0 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
@@ -267,6 +267,13 @@
     <if test="request.timeOrder != null and request.timeOrder == 0">
       ORDER by usf.create_time ASC
     </if>
+
+    <if test="request.idOrder != null and request.idOrder == 1">
+      ORDER by us.num DESC
+    </if>
+    <if test="request.idOrder != null and request.idOrder == 0">
+      ORDER by us.num ASC
+    </if>
   </select>
 
   <select id="getTestPlanRef"  parameterType="io.metersphere.xpack.ui.dto.RefReq" resultType="io.metersphere.xpack.ui.dto.RefResp">
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index c13ef4c4f2..e1ec9296dc 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit c13ef4c4f29e39de2b7de84d95a17e2e994e7b88
+Subproject commit e1ec9296dc5a5b4f2603b12b9dcf70bab5d455fc
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index f1e15954ad..b96271fdbd 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit f1e15954ad9a2466bece422fc047e972caee85ce
+Subproject commit b96271fdbdff5e80b1cd78cf921ee9f934983dbd