From 1ea79ac2a381f7b70b38cb1ea61b4c19e5cd1af8 Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Tue, 20 Sep 2022 19:13:39 +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=E8=B7=A8=E9=A1=B9=E7=9B=AE=E5=BC=95=E7=94=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017042 --user=刘瑶 【UI测试】指令编辑-跨项目引用指令步骤-打开指令-跳转页面不对 https://www.tapd.cn/55049933/s/1247801
---
 .../io/metersphere/base/mapper/UiScenarioReferenceMapper.xml  | 4 +++-
 backend/src/main/java/io/metersphere/xpack                    | 2 +-
 frontend/src/business/components/xpack                        | 2 +-
 3 files changed, 5 insertions(+), 3 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 67f3f5a6c8..599550c911 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
@@ -242,7 +242,9 @@
   </update>
 
   <select id="refList" parameterType="io.metersphere.xpack.ui.dto.RefReq" resultType="io.metersphere.xpack.ui.dto.RefResp">
-    SELECT us.id AS targetId, us.name AS scenarioName , us.num AS id,  p.name AS project,  usf.create_time AS dateStr , w.name AS workspace FROM `ui_scenario_reference` usf
+    SELECT us.id AS targetId, us.name AS scenarioName , us.num AS id,  p.name AS project,  usf.create_time AS dateStr ,
+    w.name AS workspace, p.workspace_id AS workspaceId, p.id AS projectId
+    FROM `ui_scenario_reference` usf
     LEFT JOIN ui_scenario us ON usf.ui_scenario_id = us.id
     LEFT JOIN project p ON us.project_id = p.id
     LEFT JOIN `workspace` w ON  p.workspace_id = w.id
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 4ea327cd5c..29d5973095 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 4ea327cd5c2e98fe8630e25ffa90b6195755e116
+Subproject commit 29d59730956b073e36aeac3b957211959dc91427
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index e2a4740e8f..8fae61212e 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit e2a4740e8fcc53d85778f83e7d110da970e4a919
+Subproject commit 8fae61212eea4f7b2a3d22a8b78666185d43d24f