Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
f9e90661
Commit
f9e90661
authored
3 years ago
by
chenjianxing
Browse files
Options
Download
Email Patches
Plain Diff
fix: 接口导入MS格式报空指针
parent
04e70e08
pr@dev@fix_接口导入MS格式报空指针
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
+1
-1
...etersphere/api/dto/automation/parse/MsScenarioParser.java
backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
+1
-1
...ersphere/api/dto/definition/parse/MsDefinitionParser.java
with
2 additions
and
2 deletions
+2
-2
backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
+
1
-
1
View file @
f9e90661
...
...
@@ -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
());
item
.
setApiScenarioModuleId
(
node
.
getNewId
());
item
.
setModulePath
(
node
.
getPath
());
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/api/dto/definition/parse/MsDefinitionParser.java
+
1
-
1
View file @
f9e90661
...
...
@@ -106,7 +106,7 @@ public class MsDefinitionParser extends MsAbstractParser<ApiDefinitionImport> {
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
());
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help