From ccfcdd656bcaf55976e583fdf3cc3855e42a2351 Mon Sep 17 00:00:00 2001
From: xiong_cl <140612616@qq.com>
Date: Fri, 12 Apr 2024 15:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keyware/shandan/bianmu/service/DirectoryTreeService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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<DirectoryResource> resourcePage(Page<DirectoryResource> page, String parentId, String text, boolean all) {
+    public Page<DirectoryResource> resourcePage(Page<DirectoryResource> page, String parentId, String text, boolean all,String reviewStatus) {
         DirectoryVo parent = directoryService.getById(parentId);
         HashSet<DirectoryVo> allDir = new HashSet<>();
         if (all) {
@@ -165,7 +165,8 @@ public class DirectoryTreeService {
         Set<String> dirIds = allDir.stream().map(DirectoryVo::getId).filter(allowDirIds::contains).collect(Collectors.toSet());
 
         QueryWrapper<DirectoryResource> 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.