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/WaterQualityEquipmentService.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 80ad2e7..36e7694 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
@@ -38,10 +38,17 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
- Long clientId = SecurityUtils.getClientId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-
- List<WaterQualityEquipmentBo> waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, clientId);
+ Long userId = SecurityUtils.getUserId();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
+ //涓虹┖鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, null);
+ } else {
+ waterQualityEquipmentBoList = waterQualityEquipmentMapper.listWaterQualityEquipmentByIds(keyword, userId);
+ }
return waterQualityEquipmentBoList;
}
@@ -76,10 +83,11 @@
WaterQualityEquipment one = getOne(Wrappers.lambdaQuery(WaterQualityEquipment.class).eq(WaterQualityEquipment::getWaterQualityEquipmentCode,
waterQualityEquipment.getWaterQualityEquipmentCode()));
if (one == null) {
- return save(waterQualityEquipment);
+ WaterQualityEquipment result = new WaterQualityEquipment();
+ result.setWaterQualityEquipmentCode(waterQualityEquipment.getWaterQualityEquipmentCode());
+ return save(result);
} else {
- waterQualityEquipment.setId(one.getId());
- return updateById(waterQualityEquipment);
+ throw new BusinessException("璇ユ按璐ㄨ澶囧凡瀛樺湪锛�");
}
}
}
--
Gitblit v1.9.3