From 623dd23d3f06ec0382cca8e013d998d63ba7d1d0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 27 十二月 2021 18:28:23 +0800
Subject: [PATCH] 水质设备
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java | 18 ++++++++++++------
1 files changed, 12 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..5f89415 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,7 @@
@Service
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
-
+ private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
/**
* 鏌ヨ鍏ㄩ儴姘磋川璁惧
*/
@@ -33,13 +33,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);
}
/**
--
Gitblit v1.9.3