From a53603209b61c8dd43bf96700a19fec031a95ada Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 09 五月 2022 09:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index dbb3a1b..be5e1dc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -99,6 +99,11 @@
}
}
+ if(baseConditionVO==null){
+ baseConditionVO = new BaseConditionVO();
+ baseConditionVO.setPageSize(null);
+ baseConditionVO.setPageNo(null);
+ }
CommonPage commonPage = ListPagingUtils.pages(temp, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
return commonPage;
}
--
Gitblit v1.9.3