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 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 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();