From 7abc2e222ce399ffc724c485142e5c42ff3da3b2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 28 十二月 2021 14:03:22 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 d238095..ea77199 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
@@ -18,7 +18,8 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
-
+ private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
+ private final PoleBindingService poleBindingService;
/**
* 鏌ヨ鍏ㄩ儴姘磋川璁惧
*/
@@ -33,13 +34,19 @@
* 妯＄硦鏌ヨ
*/
public List<WaterQualityEquipment> listWaterQualityEquipmentByKeyword(String keyword) {
+ if(keyword == null || keyword.trim().length() == 0){
+ return listWaterQualityEquipment();
- LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
- if (keyword != null) {
- wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
+ }else{
+ return waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
}
- List<WaterQualityEquipment> airDataList = list(wrapper);
- return airDataList;
+
+// LambdaQueryWrapper<WaterQualityEquipment> wrapper = Wrappers.lambdaQuery(WaterQualityEquipment.class);
+//// if (keyword != null) {
+//// wrapper.like(WaterQualityEquipment::getBelongTo, keyword);
+//// }
+// List<WaterQualityEquipment> airDataList = list(wrapper);
+// waterQualityEquipmentMapper.listWaterQualityEquipmentByKeyword(keyword);
}
/**
@@ -53,6 +60,9 @@
if (waterQualityEquipment == null) {
throw new BusinessException("鎵句笉鍒版按璐ㄨ澶�");
}
+ //鍒犻櫎鎽勬按璐ㄨ澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());
+
return removeById(Id);
}
--
Gitblit v1.9.3