From b927361de2147d53a6342be5fe04f2dbcb7cd7f2 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期三, 07 九月 2022 13:58:11 +0800
Subject: [PATCH] 增加CountDownLatch等待超时时间
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
index 93ade56..6d86b3e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java
@@ -93,7 +93,9 @@
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
List<PoleGroup> list;
if (clientId == null) {
--
Gitblit v1.9.3