gavin/blossom
1
0
Fork 0
mirror of https://github.com/blossom-editor/blossom.git synced 2026-03-12 17:41:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 重复查询图片文件夹的问题

Browse Source
This commit is contained in:
xiaozzzi
2024-04-05 00:35:00 +08:00
parent a51895e8ab
commit f25477ffbb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
blossom-backend/backend/src/main/java/com/blossom/backend/server/doc/DocService.java
View File

@@ -94,8 +94,10 @@ public class DocService {
// 2. 有图片的图片或文章文件夹
List<Long> pids = pictureService.listDistinctPid(req.getUserId());
if (CollUtil.isNotEmpty(pids)) {
List<FolderEntity> articleTopFolder = folderMapper.recursiveToParent(pids);
all.addAll(DocUtil.toTreeRes(articleTopFolder));
List<Long> picFolderIds = picFolder.stream().map(FolderEntity::getId).collect(Collectors.toList());
List<Long> withoutPicPids = pids.stream().filter(i -> !picFolderIds.contains(i)).collect(Collectors.toList());
List<FolderEntity> articleFolder = folderMapper.recursiveToParent(withoutPicPids);
all.addAll(DocUtil.toTreeRes(articleFolder));
}
Optional<DocTreeRes> min = all.stream().min((f1, f2) -> SortUtil.intSort.compare(f1.getS(), f2.getS()));