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

fix(接口测试): 修复接口导入报错问题 

--user=郭雨琦
This commit is contained in:
guoyuqi 2022-07-15 12:53:34 +08:00 committed by xiaomeinvG
parent 598703aa32
commit 790f077394
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/api/service/ApiModuleService.java
View File

@ -1331,7 +1331,10 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
ApiModule returnModule = null; ApiModule returnModule = null;
for (int i = 0; i < tagTree.length; i++) { for (int i = 0; i < tagTree.length; i++) {
int finalI = i; int finalI = i;
List<ApiModule> collect = parentModuleList.stream().filter(t -> t.getName().equals(tagTree[finalI])).collect(Collectors.toList()); List<ApiModule> collect = new ArrayList<>();
if (parentModuleList != null && !parentModuleList.isEmpty()) {
collect = parentModuleList.stream().filter(t -> t.getName().equals(tagTree[finalI])).collect(Collectors.toList());
}
if (collect.isEmpty()) { if (collect.isEmpty()) {
if (i == 0) { if (i == 0) {
//证明需要在根目录创建， //证明需要在根目录创建，
@ -1341,7 +1344,7 @@ public class ApiModuleService extends NodeTreeService<ApiModuleDTO> {
parentModule.setLevel(0); parentModule.setLevel(0);
parentModule.setProtocol(pidChildrenMap.get("root").get(0).getProtocol()); parentModule.setProtocol(pidChildrenMap.get("root").get(0).getProtocol());
} else { } else {
if (!parentModuleList.isEmpty() && parentModule == null) { if (parentModuleList != null && !parentModuleList.isEmpty() && parentModule == null) {
String parentId = parentModuleList.get(0).getParentId(); String parentId = parentModuleList.get(0).getParentId();
ApiModuleDTO apiModuleDTO = idModuleMap.get(parentId); ApiModuleDTO apiModuleDTO = idModuleMap.get(parentId);
parentModule = JSON.parseObject(JSON.toJSONString(apiModuleDTO), ApiModule.class); parentModule = JSON.parseObject(JSON.toJSONString(apiModuleDTO), ApiModule.class);