From 7fc99c2f631ec25b69e55a10bfde21a34ccedfbf Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 11 Dec 2024 18:11:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=85=B3=E8=81=94=E6=80=A7?=
 =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=E5=BC=B9=E7=AA=97=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1034443 --user=宋昌昌 【测试跟踪】功能用例-关联性能用例-高级搜索-创建人属于a-查询结果和性能列表数据不一致 https://www.tapd.cn/55049933/s/1629194
---
 .../io/metersphere/base/mapper/ext/ExtLoadTestMapper.xml    | 6 +++---
 .../src/business/case/components/TestCaseRelateLoadList.vue | 2 ++
 .../case/components/case/relate/CaseRelateLoadList.vue      | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

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
         <where>
+            (load_test.status is null or load_test.status != 'Trash')
             <if test="request.combine != null">
                 <include refid="combine">
                     <property name="condition" value="request.combine"/>
@@ -192,7 +192,7 @@
                                 </foreach>
                             </when>
                             <when test="key == 'user_id'">
-                                AND load_test.user_id IN
+                                AND load_test.create_user IN
                                 <foreach collection="values" item="value" separator="," open="(" close=")">
                                     #{value}
                                 </foreach>
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,