From 9694ad776893a39df749a0ba6913380f88f120ce Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 20 Mar 2023 10:49:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=91=8A=E6=90=9C=E7=B4=A2=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90=E6=B1=A0=E5=8F=96=E5=80=BC?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024600 --user=宋天阳 【测试跟踪】测试计划-性能用例-修改配置修改资源池后未按修改的资源池执行
https://www.tapd.cn/55049933/s/1352662
---
 .../base/mapper/ext/ExtTestPlanLoadCaseMapper.xml      | 10 ++++------
 .../plan/controller/TestPlanLoadCaseController.java    |  2 +-
 .../plan/service/TestPlanLoadCaseService.java          |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
index 94f3da5501..c92feeb710 100644
--- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
+++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
@@ -372,16 +372,14 @@
     <select id="getResourcePoolByPlanId" resultType="java.lang.String">
         SELECT ltr.test_resource_pool_id
         FROM test_plan_load_case tplc
-            INNER JOIN load_test_report ltr
-                ON tplc.load_case_id = ltr.test_id
+        INNER JOIN load_test_report ltr ON tplc.load_report_id = ltr.id
         WHERE tplc.test_plan_id = #{0}
     </select>
 
     <select id="getCaseResourcePoolByPlanId" resultType="java.lang.String">
-        SELECT lt.test_resource_pool_id
+
+        SELECT tplc.test_resource_pool_id
         FROM test_plan_load_case tplc
-                 INNER JOIN load_test lt
-                            ON tplc.load_case_id = lt.id
-        WHERE tplc.test_plan_id = #{0}
+        WHERE tplc.test_plan_id = #{0};
     </select>
 </mapper>
diff --git a/performance-test/backend/src/main/java/io/metersphere/plan/controller/TestPlanLoadCaseController.java b/performance-test/backend/src/main/java/io/metersphere/plan/controller/TestPlanLoadCaseController.java
index 38d1fc4e0e..530ac6dbf7 100644
--- a/performance-test/backend/src/main/java/io/metersphere/plan/controller/TestPlanLoadCaseController.java
+++ b/performance-test/backend/src/main/java/io/metersphere/plan/controller/TestPlanLoadCaseController.java
@@ -181,7 +181,7 @@ public class TestPlanLoadCaseController {
 
     @GetMapping("/resource/pool/{planId}")
     public List<String> getResourcePoolByPlanId(@PathVariable String planId) {
-        return testPlanLoadCaseService.getResourcePoolByPlanId(planId);
+        return testPlanLoadCaseService.getResourcePoolFromReportByPlanId(planId);
     }
 
     @GetMapping("/resource/pool/case/{planId}")
diff --git a/performance-test/backend/src/main/java/io/metersphere/plan/service/TestPlanLoadCaseService.java b/performance-test/backend/src/main/java/io/metersphere/plan/service/TestPlanLoadCaseService.java
index f9d9fc6a3b..7e56434213 100644
--- a/performance-test/backend/src/main/java/io/metersphere/plan/service/TestPlanLoadCaseService.java
+++ b/performance-test/backend/src/main/java/io/metersphere/plan/service/TestPlanLoadCaseService.java
@@ -713,7 +713,7 @@ public class TestPlanLoadCaseService {
                 .collect(Collectors.toList()).isEmpty();
     }
 
-    public List<String> getResourcePoolByPlanId(String planId) {
+    public List<String> getResourcePoolFromReportByPlanId(String planId) {
         return extTestPlanLoadCaseMapper.getResourcePoolByPlanId(planId);
     }