From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 14 ++++++++++++--
1 files changed, 12 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 52e71d3..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();
}
@@ -70,6 +74,12 @@
}
}
waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
+ //璁剧疆姘磋川璁惧鐘舵��
+ if (waterQualityDataDto != null) {
+ waterQualityDataDto.setState(1);
+ } else {
+ waterQualityDataDto.setState(0);
+ }
save(waterQualityData);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3