fix: 搜索时忽略folderId条件，跨子文件夹搜索文件

2026-04-03 17:52:45 +08:00
parent a1b17c11c1
commit 70c69e16cc
1 changed files with 7 additions and 4 deletions
--- a/src/main/java/com/filesystem/service/FileService.java
+++ b/src/main/java/com/filesystem/service/FileService.java
@@ -48,11 +48,14 @@ public class FileService {
        wrapper.eq(FileEntity::getUserId, userId)
               .eq(FileEntity::getIsDeleted, 0);
        
+        // 有搜索关键词时：忽略 folderId，查用户所有文件
+        if (keyword == null || keyword.isEmpty()) {
            if (folderId != null) {
                wrapper.eq(FileEntity::getFolderId, folderId);
            } else {
                wrapper.isNull(FileEntity::getFolderId);
            }
+        }
        
        if (keyword != null && !keyword.isEmpty()) {
            wrapper.like(FileEntity::getName, keyword);