From 982359342d0a4c868580c1e7db9784865941b5e1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 15:06:49 +0800
Subject: [PATCH] 大气设备、数据(农耕)

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index a4d1aed..d585874 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -67,7 +67,7 @@
         }
 
         //鍦ㄧ嚎鐘舵�佸叏閮ㄧ殑璇濋渶瑕佸垎椤�
-        if (2 == broadcastTerminalV2Param.getWorkState()) {
+        if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
             PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         }
 

--
Gitblit v1.9.3