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 | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 3d6e5d2..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
@@ -39,7 +39,9 @@
*/
public List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
Long userId = SecurityUtils.getUserId();
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
List<WaterQualityEquipmentBo> waterQualityEquipmentBoList;
//涓虹┖鏄秴绠�
if (SecurityUtils.getClientId() == null) {
@@ -81,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