From d559f5c48941908bd46487f6803941bdaf4b5f1c Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 15 May 2023 18:44:53 +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=9C=BA=E6=99=AF=E5=90=8E=E7=BD=AE=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E8=AE=BE=E7=BD=AE=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=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=1026136 --user=王孝刚 【接口测试】场景后置脚本设置环境变量失败#24364也提了同类问题获取list失败
https://www.tapd.cn/55049933/s/1371292
---
 .../java/io/metersphere/api/jmeter/KafkaListenerTask.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/jmeter/KafkaListenerTask.java b/api-test/backend/src/main/java/io/metersphere/api/jmeter/KafkaListenerTask.java
index c61a3d12e2..5a7a9d5810 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/jmeter/KafkaListenerTask.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/jmeter/KafkaListenerTask.java
@@ -45,6 +45,9 @@ public class KafkaListenerTask implements Runnable {
 
     }};
 
+    public static final String ENV = "ENV";
+
+
     @Override
     public void run() {
         try {
@@ -58,7 +61,9 @@ public class KafkaListenerTask implements Runnable {
             // 分三类存储
             Map<String, List<ResultDTO>> assortMap = new LinkedHashMap<>();
             // 携带结果
-            if (CollectionUtils.isNotEmpty(dto.getRequestResults())) {
+            if (CollectionUtils.isNotEmpty(dto.getRequestResults()) ||
+                    (MapUtils.isNotEmpty(dto.getArbitraryData()) &&
+                            dto.getArbitraryData().containsKey(ENV))) {
                 String key = RUN_MODE_MAP.get(dto.getRunMode());
                 if (assortMap.containsKey(key)) {
                     assortMap.get(key).add(dto);
@@ -68,7 +73,6 @@ public class KafkaListenerTask implements Runnable {
                     }});
                 }
             }
-
             if (MapUtils.isNotEmpty(assortMap)) {
                 testResultService.batchSaveResults(assortMap);
             }