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 zeroPage = reportDeliverMapeer.getDetailsZeroPage(limitA, limitB, queryWrapper); + if(CollUtil.isEmpty(detailsPage)){ + detailsPage = new ArrayList<>(); + } detailsPage.addAll(zeroPage); } page.setTotal(allTotal);