diff --git a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java index 27f37f6..39a5a1c 100644 --- a/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java +++ b/src/main/java/com/gunshi/project/xyt/service/ProjectEventsService.java @@ -120,7 +120,7 @@ public class ProjectEventsService extends ServiceImpl list = new ArrayList<>(); list = queryData(page,list); if (CollectionUtils.isNotEmpty(list)) { - fillFile(list); + fillFile(list.stream().filter(o->o.getType() != 6).collect(Collectors.toList())); list = list.stream().sorted(Comparator.comparing(ProjectEventsVo::getEventsDate).reversed()).collect(Collectors.toList()); List paginate = DataHandleUtil.paginate(list, page.getPageSo().getPageNumber(), page.getPageSo().getPageSize()); res.setRecords(paginate); @@ -208,7 +208,7 @@ public class ProjectEventsService extends ServiceImpl list) { - List ids = list.stream().filter(o->o.getType() != 6).map(ProjectEventsVo::getId).map(Objects::toString).collect(Collectors.toList()); + List ids = list.stream().map(ProjectEventsVo::getId).map(Objects::toString).collect(Collectors.toList()); List files = fileService.getFilesByIds(ids); Map> map = files.stream().collect(Collectors.groupingBy(FileAssociations::getBusinessId)); for (ProjectEventsVo vo : list){