From 1ec400068dc7030cb31e308e3b17136503d189c0 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 17 May 2023 19:07:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E6=B1=A0=E9=85=8D=E9=A2=9D?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1026267 --user=赵勇 【项目设置】应用管理-接口测试-接口执行资源池显示错误 https://www.tapd.cn/55049933/s/1372534

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
---
 .../java/io/metersphere/service/MsHashTreeService.java   | 3 ---
 .../frontend/src/business/menu/appmanage/AppManage.vue   | 9 ++++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java b/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java
index 038633f012..af8397af2a 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java
@@ -365,9 +365,6 @@ public class MsHashTreeService {
 
     public void caseFormatting(JSONObject element, List<String> caseIds, ParameterConfig msParameter) {
         List<ApiTestCaseInfo> caseInfos = apiTestCaseService.selectByCaseIds(caseIds);
-        if(CollectionUtils.isEmpty(caseInfos)){
-            return;
-        }
         Map<String, ApiTestCaseInfo> caseMap = caseInfos.stream()
                 .collect(Collectors.toMap(ApiTestCase::getId, a -> a, (k1, k2) -> k1));
         if (element != null && ElementConstants.REQUESTS.contains(element.optString(TYPE))) {
diff --git a/project-management/frontend/src/business/menu/appmanage/AppManage.vue b/project-management/frontend/src/business/menu/appmanage/AppManage.vue
index d259985ba9..50ee62142c 100644
--- a/project-management/frontend/src/business/menu/appmanage/AppManage.vue
+++ b/project-management/frontend/src/business/menu/appmanage/AppManage.vue
@@ -695,7 +695,6 @@ export default {
   },
   created() {
     this.init();
-    this.getBase();
     this.selectUserInProject();
     this.getResourcePools();
     this.isXpack = !!hasLicense();
@@ -714,11 +713,11 @@ export default {
           if (item.id === this.config.resourcePoolId) {
             isDelPool = false;
           }
+          if (isDelPool) {
+            this.config.resourcePoolId = undefined;
+            this.config.poolEnable = false;
+          }
         });
-        if (isDelPool) {
-          this.config.resourcePoolId = undefined;
-          this.config.poolEnable = false;
-        }
       });
     },
     runModeChange(value, other) {