问题知识库-删除时清除所有历史数据。分页列表完善。

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()).
+			query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue());
-					or(o -> {
+				if(CollectionUtils.isNotEmpty(problemKnowledgeBaseIdList)){
+					query.or(o -> {
 						o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue());
 						o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList);
 					});
+				}
 		});
 
 		String searchStr = problemKnowledgeBaseEO.getSearchStr();