From dc1bbcce07e0b1d9211edcafd6b0b39c13be395b Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 三月 2022 10:47:06 +0800
Subject: [PATCH] 灯杆倾斜fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
index 685ccdb..dee7a4e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
@@ -33,18 +33,15 @@
if (lightPoleHeelingListParam == null) {
lightPoleHeelingListParam = new LightPoleHeelingListParam();
}
-// List<LightPoleHeeling> lightPoleHeelings
-// = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword().trim(), lightPoleHeelingListParam.getProcessingState());
-
- LambdaQueryWrapper<LightPoleHeeling> wrapper = Wrappers.lambdaQuery(LightPoleHeeling.class);
- wrapper.like(LightPoleHeeling::getWarningNumber, lightPoleHeelingListParam.getKeyword().trim());
- if(lightPoleHeelingListParam.getProcessingState() != 2){
- wrapper.eq(LightPoleHeeling::getProcessingState, lightPoleHeelingListParam.getProcessingState());
+ //鍏抽敭瀛楀幓闄ょ┖鏍�
+ if (lightPoleHeelingListParam.getKeyword() != null) {
+ lightPoleHeelingListParam.setKeyword(lightPoleHeelingListParam.getKeyword().trim());
}
- wrapper.eq(LightPoleHeeling::getWarningLevel, 1).or(www -> www.eq(LightPoleHeeling::getWarningLevel, 2));
- List<LightPoleHeeling> lightPoleHeelings = list(wrapper);
+ List<LightPoleHeeling> lightPoleHeelings
+ = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword(), lightPoleHeelingListParam.getProcessingState());
+
return lightPoleHeelings;
}
--
Gitblit v1.9.3