diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java index a21660f44..c40ea99f0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java @@ -117,9 +117,17 @@ public class WorkTicketServiceImpl extends ServiceImpl enterpriseMap = enterpriseInfoService.getEnterpriseMapByProjectSn(projectSn); List ticketIds = list.stream().map(WorkTicketVo::getId).collect(Collectors.toList()); Map policeCameraItemMap = policeCameraItemService.getItemMapByProjectSn(projectSn); - Map> ticketMap = workTicketCameraRelService.list(new LambdaQueryWrapper() - .in(WorkTicketCameraRel::getWorkTicketId, ticketIds)).stream().collect(Collectors.groupingBy(WorkTicketCameraRel::getWorkTicketId, - Collectors.mapping(o -> policeCameraItemMap.get(o.getPoliceCameraId()), Collectors.toList()))); + Map> ticketMap = workTicketCameraRelService.list( + new LambdaQueryWrapper() + .in(WorkTicketCameraRel::getWorkTicketId, ticketIds)) + .stream() + .collect(Collectors.groupingBy( + WorkTicketCameraRel::getWorkTicketId, + Collectors.mapping( + o -> policeCameraItemMap.get(o.getPoliceCameraId()), + CollUtils.filteringNull() + ) + )); for (WorkTicketVo ticketVo : list) { // 设置申请人名称 ticketVo.setApplicantNames(EntityUtils.convertIdsToNames( diff --git a/src/main/java/com/zhgd/xmgl/util/CollUtils.java b/src/main/java/com/zhgd/xmgl/util/CollUtils.java new file mode 100644 index 000000000..848384de8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/util/CollUtils.java @@ -0,0 +1,18 @@ +package com.zhgd.xmgl.util; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +public class CollUtils { + /** + * 过滤掉null值的收集器 + */ + public static Collector> filteringNull() { + return Collectors.collectingAndThen( + Collectors.toList(), + list -> list.stream().filter(Objects::nonNull).collect(Collectors.toList()) + ); + } +}