From ba5d29b88aa651ba812713a18d6bc60422e64ae0 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 16 Aug 2022 16:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93-?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E6=B8=85=E9=99=A4=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E3=80=82=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProblemKnowledgeBaseEOServiceImpl.java    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 11921430d..b8c54e9e8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -50,6 +50,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 	private IProblemKnowledgeBaseClassifyEOService problemKnowledgeBaseClassifyEOService;
 	@Autowired
 	private ISysDictService sysDictService;
+	@Autowired
+	private IProblemKnowledgeBaseCommentEOService problemKnowledgeBaseCommentEOService;
 
 	/**
 	 * 保存
@@ -108,6 +110,18 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 	@Override
     public void deleteByIds(List<String> ids) {
         removeByIds(ids);
+
+        QueryWrapper deleteWrapper = new QueryWrapper<>();
+        deleteWrapper.in("problem_knowledge_base_id",ids);
+        this.problemKnowledgeBaseUserEOService.remove(deleteWrapper);
+
+        this.problemKnowledgeBasePraiseEOService.remove(deleteWrapper);
+
+        this.problemKnowledgeBaseCollectEOService.remove(deleteWrapper);
+
+        this.problemKnowledgeBaseBrowsingHistoryEOService.remove(deleteWrapper);
+
+        this.problemKnowledgeBaseCommentEOService.remove(deleteWrapper);
     }
 
 	/**
@@ -353,11 +367,13 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		List<String> problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList());
 
 		queryWrapper.lambda().and(query -> {
-			query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()).
-					or(o -> {
+			query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue());
+				if(CollectionUtils.isNotEmpty(problemKnowledgeBaseIdList)){
+					query.or(o -> {
 						o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue());
 						o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList);
 					});
+				}
 		});
 
 		String searchStr = problemKnowledgeBaseEO.getSearchStr();