From dd0399dd46c00faaca495b76c90ba92c1c41769d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 5 Dec 2022 17:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=90=8C=E6=97=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=AD=90=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryBaseServiceImpl.java    | 10 ++++++++++
 1 file changed, 10 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 ec917c1b2..90c2e8399 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
@@ -552,8 +552,18 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		// 关联删除项目下的所有收集清单
 		paramsManifestEOService.deleteByProjectId(id);
 
+		//删除主项目
 		removeById(id);
 
+		//删除子项目
+		LambdaQueryWrapper<ProjectLibraryBase> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(ProjectLibraryBase::getParentId,id);
+		List<ProjectLibraryBase> list = this.list(wrapper);
+		if(ObjectUtils.isNotEmpty(list)){
+			List<String> idList = list.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
+			this.removeByIds(idList);
+		}
+
 		//关联删除-相关人员
 		QueryWrapper<ProjectRelatedPersonnel> relatedPersonnelQueryWrapper = new QueryWrapper<>();
 		relatedPersonnelQueryWrapper.eq("project_id",id);