From 242a4347df3a7913e2551cac1561d0a6a15494bd Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Fri, 3 Apr 2026 18:04:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E6=97=B6folderId?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=A7=8B=E7=BB=88=E7=94=9F=E6=95=88=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E7=9B=AE=E5=BD=95folderId=E4=B8=BAnull=E5=88=99?=
 =?UTF-8?q?=E6=90=9C=E5=85=A8=E9=83=A8=EF=BC=8C=E5=AD=90=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=90=9C=E6=9C=AC=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/filesystem/service/FileService.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/filesystem/service/FileService.java b/src/main/java/com/filesystem/service/FileService.java
index 0fe0707..30ee59c 100644
--- a/src/main/java/com/filesystem/service/FileService.java
+++ b/src/main/java/com/filesystem/service/FileService.java
@@ -48,8 +48,16 @@ public class FileService {
         wrapper.eq(FileEntity::getUserId, userId)
                .eq(FileEntity::getIsDeleted, 0);
         
-        // 有搜索关键词时：忽略 folderId，查用户所有文件
-        if (keyword == null || keyword.isEmpty()) {
+        boolean hasKeyword = keyword != null && !keyword.isEmpty();
+        
+        if (hasKeyword) {
+            // 有搜索关键词：根目录搜索查所有，子目录搜索限当前目录
+            if (folderId != null) {
+                wrapper.eq(FileEntity::getFolderId, folderId);
+            }
+            wrapper.like(FileEntity::getName, keyword);
+        } else {
+            // 无搜索关键词：正常浏览当前目录
             if (folderId != null) {
                 wrapper.eq(FileEntity::getFolderId, folderId);
             } else {
@@ -57,10 +65,6 @@ public class FileService {
             }
         }
         
-        if (keyword != null && !keyword.isEmpty()) {
-            wrapper.like(FileEntity::getName, keyword);
-        }
-        
         wrapper.orderByDesc(FileEntity::getIsFolder)
                .orderByDesc(FileEntity::getCreateTime);