From 037d23b8e92698663808cc934ffe0b976dd5fc38 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 23 May 2023 13:51:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E7=9A=84=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=E4=B8=8D=E5=8F=AF=E7=94=A8=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8C=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=AD=E8=B5=84=E6=BA=90=E6=B1=A0=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1026439 --user=宋天阳 【测试跟踪】测试计划之前保存的资源池被禁用后会显示成ID
https://www.tapd.cn/55049933/s/1374332
---
 .../business/plan/common/TestPlanRunModeWithEnv.vue  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue b/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue
index 9338134b97..dbdb483d0f 100644
--- a/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue
+++ b/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue
@@ -304,6 +304,7 @@ export default {
     getProjectApplication() {
       getProjectConfig(getCurrentProjectID(), "").then((res) => {
         let hasPool = false;
+        //判断之前配置的资源池是否在可用资源池中
         this.resourcePools.forEach((item) => {
           if (item.id === this.runConfig.resourcePoolId) {
             hasPool = true;
@@ -311,8 +312,15 @@ export default {
         });
         if (!hasPool) {
           if (res.data && res.data.poolEnable && res.data.resourcePoolId) {
-            this.runConfig.resourcePoolId = res.data.resourcePoolId;
-            hasPool = true;
+            //判断系统配置的默认资源池是否可用
+            this.resourcePools.forEach((item) => {
+              if (item.id === res.data.resourcePoolId) {
+                hasPool = true;
+              }
+            });
+            if (hasPool) {
+              this.runConfig.resourcePoolId = res.data.resourcePoolId;
+            }
           }
         }
         if (!hasPool) {