From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
index 3d6e5d2..867aa19 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java
@@ -39,7 +39,9 @@
*/
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
Long userId = SecurityUtils.getUserId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
//涓虹┖鏄秴绠�
if (SecurityUtils.getClientId() == null) {
--
Gitblit v1.9.3