From 81f051e0bda4239c8e1a1c57a9f468de031c89a4 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 15 Jul 2022 11:05:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E6=89=B9=E9=87=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8A=A5=E9=94=99=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1014910 --user=王孝刚 【接口测试】批量编辑场景报错
https://www.tapd.cn/55049933/s/1202534
---
 .../api/service/ApiAutomationService.java      | 11 ++++++++++-
 .../api/service/ApiDefinitionService.java      | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 1a9e83deeb..55452a32a9 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -1169,7 +1169,16 @@ public class ApiAutomationService {
                 scenarioRequest.setProjectId(scenario.getProjectId());
                 scenarioRequest.setName(scenario.getName());
                 scenarioRequest.setId(scenario.getId());
-                scenarioRequest.setApiScenarioModuleId(request.getApiScenarioModuleId());
+                if (StringUtils.isEmpty(request.getApiScenarioModuleId())) {
+                    scenarioRequest.setApiScenarioModuleId(scenario.getApiScenarioModuleId());
+                } else {
+                    scenarioRequest.setApiScenarioModuleId(request.getApiScenarioModuleId());
+                }
+                if (StringUtils.isEmpty(request.getModulePath())) {
+                    scenarioRequest.setModulePath(scenario.getModulePath());
+                } else {
+                    scenarioRequest.setModulePath(request.getModulePath());
+                }
                 scenarioRequest.setModulePath(request.getModulePath());
                 scenarioRequest.setVersionId(scenario.getVersionId());
                 checkNameExist(scenarioRequest, false);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 63620a824e..817c90acc0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -1600,13 +1600,25 @@ public class ApiDefinitionService {
                 //检查是否同名
                 SaveApiDefinitionRequest apiDefinitionRequest = new SaveApiDefinitionRequest();
                 apiDefinitionRequest.setProjectId(api.getProjectId());
-                apiDefinitionRequest.setMethod(api.getMethod());
+                if (StringUtils.isEmpty(request.getMethod())) {
+                    apiDefinitionRequest.setMethod(api.getMethod());
+                } else {
+                    apiDefinitionRequest.setMethod(request.getMethod());
+                }
                 apiDefinitionRequest.setProtocol(api.getProtocol());
                 apiDefinitionRequest.setPath(api.getPath());
                 apiDefinitionRequest.setName(api.getName());
                 apiDefinitionRequest.setId(api.getId());
-                apiDefinitionRequest.setModuleId(request.getModuleId());
-                apiDefinitionRequest.setModulePath(request.getModulePath());
+                if (StringUtils.isEmpty(request.getModuleId())) {
+                    apiDefinitionRequest.setModuleId(api.getModuleId());
+                } else {
+                    apiDefinitionRequest.setMethod((request.getModuleId()));
+                }
+                if (StringUtils.isEmpty(request.getModulePath())) {
+                    apiDefinitionRequest.setModulePath(api.getModulePath());
+                } else {
+                    apiDefinitionRequest.setModulePath(request.getModulePath());
+                }
                 apiDefinitionRequest.setVersionId(api.getVersionId());
                 checkNameExist(apiDefinitionRequest, false);
             });