From 70c69e16cc680c690e5f58d8f1c8925b62e94d88 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Fri, 3 Apr 2026 17:52:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E6=97=B6=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5folderId=E6=9D=A1=E4=BB=B6=EF=BC=8C=E8=B7=A8=E5=AD=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=90=9C=E7=B4=A2=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/filesystem/service/FileService.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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