From 467d8afcda1648e7a2608aca3daba554081c7fb5 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 14 Apr 2023 18:43:44 +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=A4=9A=E5=B1=82=E5=B5=8C=E5=A5=97=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=9C=BA=E6=99=AF=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=AD=90=E7=BA=A7=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1025447 --user=王孝刚
github#23645【接口测试】-接口自动化-场景引用-禁用某一步骤后显示保存成功，再次打开发现仍显示启用
https://www.tapd.cn/55049933/s/1363065
---
 .../service/MsHashTreeService.java            | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java b/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java
index ff7d3e6570..30312ab54f 100644
--- a/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java
+++ b/api-test/backend/src/main/java/io/metersphere/service/MsHashTreeService.java
@@ -281,15 +281,16 @@ public class MsHashTreeService {
         }
         try {
             if (orgElement.has(HASH_TREE)) {
-                JSONArray orgJSONArray = orgElement.optJSONArray(HASH_TREE);
-                JSONArray targetJSONArray = targetElement.optJSONArray(HASH_TREE);
-                if (orgJSONArray != null && targetJSONArray != null) {
-                    orgJSONArray.forEach(obj -> {
-                        JSONObject orgJsonObject = (JSONObject) obj;
-                        targetJSONArray.forEach(targetObj -> {
-                            JSONObject targetJsonObject = (JSONObject) targetObj;
-                            if (StringUtils.equals(orgJsonObject.optString(RESOURCE_ID), targetJsonObject.optString(RESOURCE_ID))) {
-                                setRefEnable(targetJsonObject, orgJsonObject);
+                JSONArray org = orgElement.optJSONArray(HASH_TREE);
+                JSONArray target = targetElement.optJSONArray(HASH_TREE);
+                if (org != null && target != null) {
+                    org.forEach(obj -> {
+                        JSONObject childOrg = (JSONObject) obj;
+                        target.forEach(targetObj -> {
+                            JSONObject childTarget = (JSONObject) targetObj;
+                            if (StringUtils.equals(childOrg.optString(ID), childTarget.optString(ID))
+                            && StringUtils.equals(childOrg.optString(INDEX), childTarget.optString(INDEX))) {
+                                setRefEnable(childTarget, childOrg);
                             }
                         });
                     });