From 20b3174657e35e4eee33b5f6b85c912605517f80 Mon Sep 17 00:00:00 2001
From: Jianguo-Genius <herman.song.yang@gmail.com>
Date: Fri, 19 Jul 2024 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C=E6=8E=A5=E5=8F=A3=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E7=9A=84=E8=AE=BE=E7=BD=AE=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=84=9A=E6=9C=AC=E6=97=B6=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E7=9A=84=E4=B8=8D=E6=98=AF=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=8E=AF=E5=A2=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1044094 --user=宋天阳 【测试计划】github#32100CASE使用环境变量更新脚本更新变量值，其放在测试计划内执行时更新的仍然是原CASE内保存对应环境内的变量值，而不是执行测试计划时选择的新环境 https://www.tapd.cn/55049933/s/1551295
---
 .../definition/request/sampler/MsHTTPSamplerProxy.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index e7e2ad944e..6f29685942 100644
--- a/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/api-test/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -261,7 +261,13 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                     if (this.getEnvironmentId() == null) {
                         el.setEnvironmentId(useEnvironment);
                     } else {
-                        el.setEnvironmentId(this.getEnvironmentId());
+                        // http内部的子组件， 实际使用ID以useEnvironment为准
+                        if (StringUtils.isEmpty(this.useEnvironment)) {
+                            el.setEnvironmentId(this.getEnvironmentId());
+                        } else {
+                            el.setEnvironmentId(this.useEnvironment);
+                        }
+
                     }
                 }
                 el.toHashTree(httpSamplerTree, el.getHashTree(), config);