manager/system-file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gaoxq
2026-04-03 17:52:45 +08:00
parent a1b17c11c1
commit 70c69e16cc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/filesystem/service/FileService.java
View File

@@ -48,10 +48,13 @@ public class FileService {
wrapper.eq(FileEntity::getUserId, userId) wrapper.eq(FileEntity::getUserId, userId)
.eq(FileEntity::getIsDeleted, 0); .eq(FileEntity::getIsDeleted, 0);
if (folderId != null) { // 有搜索关键词时：忽略 folderId，查用户所有文件
wrapper.eq(FileEntity::getFolderId, folderId); if (keyword == null || keyword.isEmpty()) {
} else { if (folderId != null) {
wrapper.isNull(FileEntity::getFolderId); wrapper.eq(FileEntity::getFolderId, folderId);
} else {
wrapper.isNull(FileEntity::getFolderId);
}
} }
if (keyword != null && !keyword.isEmpty()) { if (keyword != null && !keyword.isEmpty()) {