From eeaa98f3be98b569deddcfbb767374457d9be970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 26 Oct 2023 14:29:14 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/service/majornetwork/Impl/ReportServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 2e851e4e6..e7e96375c 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -1984,9 +1984,12 @@ public class ReportServiceImpl implements ReportService { */ @Override public Page getEventReport(WaveTypeParam deviceInfoParam) { - Page page = new Page<>(); + Page page = new Page<>(deviceInfoParam.getPageNum(),deviceInfoParam.getPageSize()); List generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData(); List lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); + if(CollUtil.isEmpty(lineIds)){ + return page; + } LineBaseQueryParam lineBaseQueryParam = new LineBaseQueryParam(); lineBaseQueryParam.setLineIds(lineIds);