From d3a24baad0c37a74de6f2dbc1228775e51bfd016 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 10 Jul 2024 14:50:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/report/service/impl/ReportDeliverServiceImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
index 5db7938a1..ba575f5a5 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java
@@ -1,5 +1,6 @@
 package com.logpm.report.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -36,6 +37,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -194,6 +196,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 			limitB = zeroSize;
 			page1.setSize(zeroSize);
 			List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(limitA, limitB, queryWrapper);
+			if(CollUtil.isEmpty(detailsPage)){
+				detailsPage = new ArrayList<>();
+			}
 			detailsPage.addAll(zeroPage);
 		}
 		page.setTotal(allTotal);