From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java
index c69a6a9..c8bb945 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java
@@ -15,7 +15,7 @@
import java.util.List;
/**
- * 鐏潌妯″潡浠ュ強璁剧疆鍒嗙粍鍒板搴旂伅鏉�
+ * 鐏潌妯″潡浠ュ強璁剧疆鍒嗙粍鍒板搴旂伅鏉� 寮冪敤
*/
@RestController
@AllArgsConstructor
@@ -81,12 +81,10 @@
LambdaQueryWrapper<LampPost> wrapper = Wrappers.lambdaQuery(LampPost.class);
if(receiveParam.getKeyWord()!=null){
wrapper.like(LampPost::getLampId,receiveParam.getKeyWord())
- .or(lampPostLambdaQueryWrapper -> {
- lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord());
- });
+ .or(lampPostLambdaQueryWrapper -> lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord()));
}
- List<LampPost> lsit= poleService.list(wrapper);
- return ResponseUtil.success(lsit);
+ List<LampPost> list= poleService.list(wrapper);
+ return ResponseUtil.success(list);
}
}
--
Gitblit v1.9.3