From 8c4f29f143aabff3f706add7354af1bdc5bf0270 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Fri, 15 Jul 2022 12:53:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=AF=BC=E5=85=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --user=郭雨琦 --- .../java/io/metersphere/api/service/ApiModuleService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java index e6eee7d951..a1d2e07b60 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiModuleService.java @@ -1331,7 +1331,10 @@ public class ApiModuleService extends NodeTreeService { ApiModule returnModule = null; for (int i = 0; i < tagTree.length; i++) { int finalI = i; - List collect = parentModuleList.stream().filter(t -> t.getName().equals(tagTree[finalI])).collect(Collectors.toList()); + List 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 (i == 0) { //证明需要在根目录创建， @@ -1341,7 +1344,7 @@ public class ApiModuleService extends NodeTreeService { parentModule.setLevel(0); parentModule.setProtocol(pidChildrenMap.get("root").get(0).getProtocol()); } else { - if (!parentModuleList.isEmpty() && parentModule == null) { + if (parentModuleList != null && !parentModuleList.isEmpty() && parentModule == null) { String parentId = parentModuleList.get(0).getParentId(); ApiModuleDTO apiModuleDTO = idModuleMap.get(parentId); parentModule = JSON.parseObject(JSON.toJSONString(apiModuleDTO), ApiModule.class);