From e15b1624a85856b36c8df06d1b7545a8e7c0af61 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Fri, 26 Feb 2021 13:38:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=E4=B8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/definition/request/sampler/MsHTTPSamplerProxy.java | 2 +- .../java/io/metersphere/api/service/ApiDefinitionService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java index e63e555cbd..5557952920 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java @@ -101,7 +101,7 @@ public class MsHTTPSamplerProxy extends MsTestElement { HTTPSamplerProxy sampler = new HTTPSamplerProxy(); sampler.setEnabled(this.isEnable()); sampler.setName(this.getName()); - String name = this.getParentName(this.getParent(), config); + String name = this.getParentName(this.getParent()); if (StringUtils.isNotEmpty(name) && !config.isOperating()) { sampler.setName(this.getName() + "<->" + name); } 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 8f9a45da4b..7ee46aa7a1 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -436,7 +436,7 @@ public class ApiDefinitionService { Map envConfig = new HashMap<>(); Map map = request.getEnvironmentMap(); - if (map != null) { + if (map != null && map.size() > 0) { map.keySet().forEach(id -> { ApiTestEnvironmentWithBLOBs environment = environmentService.get(map.get(id)); EnvironmentConfig env = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);