test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
chenjianxing 2021-07-21 17:38:44 +08:00 committed by jianxing
parent 1d4d99acf7
commit b22b491109
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
View File

@ -97,7 +97,7 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
} }
} }
if (finalNodeMap != null) { if (finalNodeMap != null && finalNodeMap.get(item.getApiScenarioModuleId()) != null) {
NodeTree node = finalNodeMap.get(item.getApiScenarioModuleId()); NodeTree node = finalNodeMap.get(item.getApiScenarioModuleId());
item.setApiScenarioModuleId(node.getNewId()); item.setApiScenarioModuleId(node.getNewId());
item.setModulePath(node.getPath()); item.setModulePath(node.getPath());

2
backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
View File

@ -106,7 +106,7 @@ public class MsDefinitionParser extends MsAbstractParser<ApiDefinitionImport> {
String originId = apiDefinition.getId(); String originId = apiDefinition.getId();
String id = UUID.randomUUID().toString(); String id = UUID.randomUUID().toString();
if (nodeMap != null) { if (nodeMap != null && nodeMap.get(apiDefinition.getModuleId()) != null) {
NodeTree nodeTree = nodeMap.get(apiDefinition.getModuleId()); NodeTree nodeTree = nodeMap.get(apiDefinition.getModuleId());
apiDefinition.setModuleId(nodeTree.getNewId()); apiDefinition.setModuleId(nodeTree.getNewId());
apiDefinition.setModulePath(nodeTree.getPath()); apiDefinition.setModulePath(nodeTree.getPath());