diff --git a/src/main/java/com/filesystem/service/FileService.java b/src/main/java/com/filesystem/service/FileService.java
index 3b1e117..0fe0707 100644
--- a/src/main/java/com/filesystem/service/FileService.java
+++ b/src/main/java/com/filesystem/service/FileService.java
@@ -48,10 +48,13 @@ public class FileService {
         wrapper.eq(FileEntity::getUserId, userId)
                .eq(FileEntity::getIsDeleted, 0);
         
-        if (folderId != null) {
-            wrapper.eq(FileEntity::getFolderId, folderId);
-        } else {
-            wrapper.isNull(FileEntity::getFolderId);
+        // 有搜索关键词时：忽略 folderId，查用户所有文件
+        if (keyword == null || keyword.isEmpty()) {
+            if (folderId != null) {
+                wrapper.eq(FileEntity::getFolderId, folderId);
+            } else {
+                wrapper.isNull(FileEntity::getFolderId);
+            }
         }
         
         if (keyword != null && !keyword.isEmpty()) {