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