From d57d96ce51231734aa0b4979abeea17271660c1e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 26 四月 2022 17:10:46 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index 940439b..b27bcc6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -18,6 +18,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -71,6 +72,9 @@
CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
List<LightReportDataBo> lightReportDataBos = ( List<LightReportDataBo>)commonPage.getList();
+ if(lightReportDataBos == null){
+ return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
+ }
CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
commonPage1.setTotal(commonPage.getTotal());
commonPage1.setTotalPage(commonPage.getTotalPage());
--
Gitblit v1.9.3