From fbde8efa549729832f3fed82274e18600935e3e1 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 13 Oct 2022 18:01:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5JMeter=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1017880 --user=赵勇 【接口测试】接口自动化-导入jmeter格式-执行场景-报告无法查看请求结果 https://www.tapd.cn/55049933/s/1260836
---
 .../api/exec/scenario/ApiScenarioEnvService.java  |  2 +-
 .../ApiScenarioReportStructureService.java        | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java b/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
index eed23dd67c..d3c5ebbbcb 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
@@ -175,7 +175,7 @@ public class ApiScenarioEnvService {
         String definition = apiScenarioWithBLOBs.getScenarioDefinition();
         MsScenario scenario = JSON.parseObject(definition, MsScenario.class);
         GenerateHashTreeUtil.parse(definition, scenario);
-        if (StringUtils.equals(environmentType, EnvironmentType.JSON.toString())) {
+        if (StringUtils.equals(environmentType, EnvironmentType.JSON.toString()) && StringUtils.isNotEmpty(environmentJson)) {
             scenario.setEnvironmentMap(JSON.parseObject(environmentJson, Map.class));
         } else if (StringUtils.equals(environmentType, EnvironmentType.GROUP.toString())) {
             Map<String, String> map = environmentGroupProjectService.getEnvMap(environmentGroupId);
diff --git a/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportStructureService.java b/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportStructureService.java
index 1f090cd44c..b4cebcf392 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportStructureService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportStructureService.java
@@ -63,8 +63,19 @@ import java.util.stream.Collectors;
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ApiScenarioReportStructureService {
-    private static final List<String> REQUESTS = ElementConstants.REQUESTS;
-    private static final List<String> CONTROLS = Arrays.asList(ElementConstants.ASSERTIONS, ElementConstants.IF_CONTROLLER, ElementConstants.CONSTANT_TIMER);
+    private static final List<String> REQUESTS = Arrays.asList(
+            ElementConstants.HTTP_SAMPLER,
+            ElementConstants.DUBBO_SAMPLER,
+            ElementConstants.JDBC_SAMPLER,
+            ElementConstants.TCP_SAMPLER,
+            ElementConstants.JSR223,
+            ElementConstants.ABS_SAMPLER
+    );
+    private static final List<String> CONTROLS = Arrays.asList(
+            ElementConstants.ASSERTIONS,
+            ElementConstants.IF_CONTROLLER,
+            ElementConstants.CONSTANT_TIMER
+    );
     private static final String RESOURCE_ID = "resourceId";
     private static final String REFERENCED = "referenced";
     private static final String ERROR_CODE = "errorCode";