Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-02-11 16:44:45 +08:00

View File

@@ -4660,7 +4660,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
.eq(ObjectUtils.isNotEmpty(req.getDirType()), FileMetadataInfo::getDirType, req.getDirType())
.eq(ObjectUtils.isNotEmpty(req.getDataType()), FileMetadataInfo::getDataType, req.getDataType())
// 仅显示顶层删除项:即其父级未被删除(或者无父级)
.apply("(parent_id IS NULL OR NOT EXISTS (SELECT 1 FROM file_metadata_info p WHERE p.id = parent_id AND p.deleted_at IS NOT NULL))")
.apply("(parentId IS NULL OR NOT EXISTS (SELECT 1 FROM file_metadata_info p WHERE p.id = parentId AND p.deletedAt IS NOT NULL))")
.orderByDesc(FileMetadataInfo::getDeletedAt)
.list();