fix: 接口导入MS格式报空指针

babysor · Jul 21, 2021 · b22b491 · b22b491
1 parent 1d4d99a
commit b22b491
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
@@ -97,7 +97,7 @@ private ScenarioImport parseMsFormat(String testStr, ApiTestImportRequest import
                     }
                 }
 
-                if (finalNodeMap != null) {
+                if (finalNodeMap != null && finalNodeMap.get(item.getApiScenarioModuleId()) != null) {
                     NodeTree node = finalNodeMap.get(item.getApiScenarioModuleId());
                     item.setApiScenarioModuleId(node.getNewId());
                     item.setModulePath(node.getPath());

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java b/backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
@@ -106,7 +106,7 @@ private void parseApiDefinition(ApiDefinitionWithBLOBs apiDefinition, ApiTestImp
         String originId = apiDefinition.getId();
         String id = UUID.randomUUID().toString();
 
-        if (nodeMap != null) {
+        if (nodeMap != null && nodeMap.get(apiDefinition.getModuleId()) != null) {
             NodeTree nodeTree = nodeMap.get(apiDefinition.getModuleId());
             apiDefinition.setModuleId(nodeTree.getNewId());
             apiDefinition.setModulePath(nodeTree.getPath());