From 71279ea0bb3c52618f381bc0c4ac25eb7bc783b7 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Tue, 8 Nov 2022 16:28:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=8E=AF=E5=A2=83=E5=8A=A0=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.tapd.cn/55049933/prong/stories/view/1155049933001010410

--user=郭雨琦
---
 .../metersphere/service/plan/TestPlanApiCaseService.java  | 3 ++-
 .../java/io/metersphere/plan/service/TestPlanService.java | 8 ++++++--
 .../src/business/plan/common/TestPlanRunModeWithEnv.vue   | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java
index 59e2f6a708..25b92a5f4c 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/plan/TestPlanApiCaseService.java
@@ -670,7 +670,7 @@ public class TestPlanApiCaseService {
             String caseId = testPlanApiCase.getApiCaseId();
             String envId = testPlanApiCase.getEnvironmentId();
             String projectId = projectCaseIdMap.get(caseId);
-            if (StringUtils.isNotBlank(projectId)) {
+            if (StringUtils.isNotBlank(projectId) && StringUtils.isNotBlank(envId)) {
                 if (envMap.containsKey(projectId)) {
                     List<String> list = envMap.get(projectId);
                     if (!list.contains(envId)) {
@@ -682,6 +682,7 @@ public class TestPlanApiCaseService {
                     envMap.put(projectId, envs);
                 }
             }
+
         });
         return envMap;
     }
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
index 19f2ac6781..945a4f8199 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -1499,9 +1499,13 @@ public class TestPlanService {
                         .flatMap(Collection::stream)
                         .distinct()
                         .collect(Collectors.toList());
-                envMap.put(projectId, result);
+                if (CollectionUtils.isNotEmpty(result)){
+                    envMap.put(projectId, result);
+                }
             } else {
-                envMap.put(projectId, scenarioEnv.get(projectId));
+                if (CollectionUtils.isNotEmpty(scenarioEnv.get(projectId))){
+                    envMap.put(projectId, scenarioEnv.get(projectId));
+                }
             }
         }
 
diff --git a/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue b/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue
index a74ba21cc4..695bfa2894 100644
--- a/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue
+++ b/test-track/frontend/src/business/plan/common/TestPlanRunModeWithEnv.vue
@@ -162,12 +162,12 @@
         <el-dropdown @command="handleCommand" style="margin-left: 5px">
           <el-button type="primary">
             {{
-              $t("commons.run")
+              $t("api_test.run")
             }}<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="run">{{
-                $t("commons.run")
+                $t("api_test.run")
               }}
             </el-dropdown-item>
             <el-dropdown-item command="runAndSave">{{