diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml index 32d8bf07cc..1b595e59c2 100644 --- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml +++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml @@ -151,9 +151,9 @@ FROM load_test LEFT JOIN project ON load_test.project_id = project.id LEFT JOIN user ON load_test.user_id = user.id - LEFT JOIN project_version on project.id = project_version.project_id AND project_version.id = - load_test.version_id + LEFT JOIN project_version on project.id = project_version.project_id AND project_version.id = load_test.version_id + (load_test.status is null or load_test.status != 'Trash') @@ -192,7 +192,7 @@ - AND load_test.user_id IN + AND load_test.create_user IN #{value} diff --git a/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue b/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue index 3a5923f2f7..75915ad405 100644 --- a/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue +++ b/test-track/frontend/src/business/case/components/TestCaseRelateLoadList.vue @@ -82,10 +82,12 @@ import {TEST_CASE_RELEVANCE_LOAD_CASE} from "metersphere-frontend/src/components import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersionSelect"; import {getVersionFilters} from "@/business/utils/sdk-utils"; import {getTestCaseRelevanceLoadList} from "@/api/testCase"; +import MsPerformanceTestStatus from "@/business/performance/PerformanceTestStatus.vue"; export default { name: "TestCaseRelateLoadList", components: { + MsPerformanceTestStatus, MsTablePagination, MsTable, MsTableColumn, diff --git a/test-track/frontend/src/business/case/components/case/relate/CaseRelateLoadList.vue b/test-track/frontend/src/business/case/components/case/relate/CaseRelateLoadList.vue index 52b06fa7f1..e16e86bb2e 100644 --- a/test-track/frontend/src/business/case/components/case/relate/CaseRelateLoadList.vue +++ b/test-track/frontend/src/business/case/components/case/relate/CaseRelateLoadList.vue @@ -109,10 +109,12 @@ import MxVersionSelect from "metersphere-frontend/src/components/version/MxVersi import { getVersionFilters } from "@/business/utils/sdk-utils"; import { getTestCaseRelevanceLoadList } from "@/api/testCase"; import {getCurrentProjectID} from "metersphere-frontend/src/utils/token"; +import MsPerformanceTestStatus from "@/business/performance/PerformanceTestStatus.vue"; export default { name: "CaseRelateLoadList", components: { + MsPerformanceTestStatus, MsTablePagination, MsTable, MsTableColumn,