From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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..8be5742 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,10 +74,17 @@
}
}
waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
+ //璁剧疆姘磋川璁惧鐘舵��
+ if (waterQualityDataDto != null) {
+ waterQualityDataDto.setState(1);
+ } else {
+ waterQualityDataDto.setState(0);
+ }
save(waterQualityData);
} catch (Exception e) {
e.printStackTrace();
- throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
+ log.error("姘磋川璁惧鍙蜂笉姝ｇ‘");
+// throw new BusinessException("姘磋川璁惧鍙蜂笉姝ｇ‘");
}
return waterQualityDataDto;
--
Gitblit v1.9.3