From 2de68664756f019f8cfff7207036c05bf749007c Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 19 Jul 2021 14:47:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E7=8E=AF=E5=A2=83=E6=9C=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#1005210=20--bug=3D1005210=20--user=3D=E8=B5=B5?=
 =?UTF-8?q?=E5=8B=87=20=E3=80=90=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E7=8E=AF=E5=A2=83...=20https://www.tapd.cn/?=
 =?UTF-8?q?55049933/s/1025828?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/service/ApiTestEnvironmentService.java | 3 +++
 .../api/test/components/environment/EnvironmentEdit.vue       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
index 8efee1f17d..14b0ba4bfb 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
@@ -116,6 +116,9 @@ public class ApiTestEnvironmentService {
     }
     private void checkEnvironmentExist(ApiTestEnvironmentWithBLOBs environment) {
         if (environment.getName() != null) {
+            if(StringUtils.isEmpty(environment.getProjectId())){
+                MSException.throwException(Translator.get("项目ID不能为空"));
+            }
             ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
             ApiTestEnvironmentExample.Criteria criteria = example.createCriteria();
             criteria.andNameEqualTo(environment.getName())
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
index 78dacc5692..109711632c 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentEdit.vue
@@ -126,6 +126,10 @@
         return uploadFiles;
       },
       _save(environment) {
+        if(!this.projectId){
+          this.$warning(this.$t('api_test.select_project'));
+          return;
+        }
         let bodyFiles = this.geFiles(environment);
         let param = this.buildParam(environment);
         let url = '/api/environment/add';