From 85849f2108f96aa2855de5dca29cbb1fce91f414 Mon Sep 17 00:00:00 2001
From: MeterSphere Bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Tue, 20 Sep 2022 11:46:35 +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=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E4=BA=8E=E5=9C=BA=E6=99=AF=E5=8F=98=E9=87=8F=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=20(#18053)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016781 --user=王孝刚 【接口测试】github#17873，最新版本环境变量优先级大于了场景变量
https://www.tapd.cn/55049933/s/1246281

Co-authored-by: wxg0103 <727495428@qq.com>
---
 .../metersphere/api/dto/definition/request/ElementUtil.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
index 7942a34311..3bae43c346 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/ElementUtil.java
@@ -849,8 +849,8 @@ public class ElementUtil {
                 }
             });
             // 清空变量，防止重复添加
-            config.getConfig().get(projectId).getCommonConfig().getVariables().remove(constants);
-            config.getConfig().get(projectId).getCommonConfig().getVariables().remove(variableList);
+            config.getConfig().get(projectId).getCommonConfig().getVariables().removeAll(constants);
+            config.getConfig().get(projectId).getCommonConfig().getVariables().removeAll(variableList);
         }
 
         if (arguments.getArguments() != null && arguments.getArguments().size() > 0) {