From 18efbb8a444dfbc8c4000499e2b3c904b8a78507 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 18 Oct 2022 11:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93--=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 9913d5ce2..ebbb75150 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -481,6 +481,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 			List<ProjectLibraryBase> children = result.stream()
 					.filter(e -> StringUtils.isNotBlank(e.getParentId()) && projectLibraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
 			if(children.size() != 0){
+				//子项目的基础上添加的子项目
+				List<String> childrenIdList = children.stream().map(ProjectLibraryBase::getId).distinct().collect(Collectors.toList());
+				List<ProjectLibraryBase> childrenList = result.stream()
+						.filter(e -> StringUtils.isNotBlank(e.getParentId()) && childrenIdList.contains(e.getParentId())).collect(Collectors.toList());
+				children.addAll(childrenList);
+
 				//按版本排序
 				Collections.sort(children);
 				projectLibraryBase.setChildren(children);