diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java index 6caf24c..a407b81 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java +++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/service/DirectoryTreeService.java @@ -153,7 +153,7 @@ public class DirectoryTreeService { return directoryService.list(wrapper); } - public Page resourcePage(Page page, String parentId, String text, boolean all) { + public Page resourcePage(Page page, String parentId, String text, boolean all,String reviewStatus) { DirectoryVo parent = directoryService.getById(parentId); HashSet allDir = new HashSet<>(); if (all) { @@ -165,7 +165,8 @@ public class DirectoryTreeService { Set dirIds = allDir.stream().map(DirectoryVo::getId).filter(allowDirIds::contains).collect(Collectors.toSet()); QueryWrapper query = new QueryWrapper<>(); - query.in("PARENT_ID", dirIds); + query.in(dirIds.size()>0,"PARENT_ID", dirIds); + query.eq(StringUtils.hasText(reviewStatus),"REVIEW_STATUS", reviewStatus); if (StringUtils.hasText(text)) { query.and(queryWrapper -> { queryWrapper.