From b5636d84bf2ad494cf766766e0bb465cb914058b Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 10 Jan 2022 13:34:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=BA=E6=99=AF=E4=BF=9D=E5=AD=98=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复通过模块树上方的更多操作中创建场景时，关联接口用例之后保存报错的问题
---
 .../io/metersphere/api/exec/utils/GenerateHashTreeUtil.java   | 4 +++-
 frontend/src/business/components/xpack                        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
index fec9d4659f..245231c2b7 100644
--- a/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
+++ b/backend/src/main/java/io/metersphere/api/exec/utils/GenerateHashTreeUtil.java
@@ -35,7 +35,9 @@ public class GenerateHashTreeUtil {
     public static MsScenario parseScenarioDefinition(String scenarioDefinition) {
         if (StringUtils.isNotEmpty(scenarioDefinition)) {
             MsScenario scenario = JSONObject.parseObject(scenarioDefinition, MsScenario.class);
-            parse(scenarioDefinition, scenario);
+            if (scenario != null) {
+                parse(scenarioDefinition, scenario);
+            }
             return scenario;
         }
         return null;
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a19c6c046e..1453e4f23b 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a19c6c046e81a391bc96e39fe469d31d3de8d9aa
+Subproject commit 1453e4f23bc9afda8837c43454c15a92b0468b66