From c9586d61be8ae3411c6428a2cc2588c11f97db2c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 18:15:16 +0800
Subject: [PATCH] fix
---
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