From e461c61c7ba1badb90e78bf37966b18c15db12dc Mon Sep 17 00:00:00 2001 From: "nathan.liu" Date: Mon, 19 Sep 2022 21:15:51 +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=9C=BA=E6=99=AF=E6=9F=A5=E7=9C=8B=E5=BC=95=E7=94=A8?= =?UTF-8?q?-=E7=82=B9=E5=87=BB=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=90=8D=E7=A7=B0-=E6=9C=AA=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1016924 --user=刘瑶 【UI测试】场景查看引用-点击测试计划名称-未跳转到测试计划详情页 https://www.tapd.cn/55049933/s/1246082 --- .../metersphere/base/mapper/UiScenarioReferenceMapper.java | 7 ++----- .../metersphere/base/mapper/UiScenarioReferenceMapper.xml | 5 +++-- backend/src/main/java/io/metersphere/xpack | 2 +- frontend/src/business/components/xpack | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.java b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.java index 39758c9879..28929a8529 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.java @@ -4,10 +4,7 @@ import io.metersphere.base.domain.UiScenarioReference; import io.metersphere.base.domain.UiScenarioReferenceExample; import java.util.List; -import io.metersphere.xpack.ui.dto.RefReq; -import io.metersphere.xpack.ui.dto.RefResp; -import io.metersphere.xpack.ui.dto.UiCheckRefDTO; -import io.metersphere.xpack.ui.dto.UiCheckRefReq; +import io.metersphere.xpack.ui.dto.*; import org.apache.ibatis.annotations.Param; public interface UiScenarioReferenceMapper { @@ -38,7 +35,7 @@ public interface UiScenarioReferenceMapper { */ List refList(@Param("request") RefReq request); - List getTestPlanRef(@Param("request") RefReq request); + List getTestPlanRef(@Param("request") RefReq request); List checkRef(@Param("request")UiCheckRefReq request); } \ No newline at end of file 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 e86c133de5..67f3f5a6c8 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml @@ -276,8 +276,9 @@ - + SELECT tp.name AS scenarioName , us.id AS id, p.name AS project, us.create_time AS dateStr , w.name AS workspace, tp.id AS targetId, + p.workspace_id AS workspaceId, p.id AS projectId FROM `test_plan_ui_scenario` us LEFT JOIN `test_plan` tp ON us.test_plan_id = tp.id LEFT JOIN project p ON tp.project_id = p.id diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 2860b379a3..4ea327cd5c 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 2860b379a3a4d363df531b002bcd699c01c8a29f +Subproject commit 4ea327cd5c2e98fe8630e25ffa90b6195755e116 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index a93dfd4ffc..e2a4740e8f 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit a93dfd4ffcde2e8344d38bd218b63c9a76e989d5 +Subproject commit e2a4740e8fcc53d85778f83e7d110da970e4a919