From 187dc7c743b5bc0bdd9e111aac0c083ed6d92672 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Mon, 30 Sep 2024 10:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=A8=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E4=B8=AD=E7=99=BD=E8=9A=81=E6=99=AE=E6=9F=A5?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gunshi/project/xyt/service/ProjectEventsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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){