From 7e2175df8ed913a858296d4fde0d268879a91daf Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 11:09:37 +0800
Subject: [PATCH] 首页

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

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
index 92cc163..c29d11d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java
@@ -29,9 +29,13 @@
      * 妯$硦鏌ヨ
      */
     public List<WaterQualityDataBo> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, String keyword) {
-        Long clientId = SecurityUtils.getClientId();
         PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-        List<Long> waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, clientId);
+        List<Long> waterQualityDataId;
+        if(SecurityUtils.getClientId() == null){
+            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, null);
+        }else{
+            waterQualityDataId = waterQualityDataMapper.listWaterQualityDataId(keyword, SecurityUtils.getUserId());
+        }
         if (CollUtil.isEmpty(waterQualityDataId)) {
             return CollUtil.newArrayList();
         }

--
Gitblit v1.9.3