From 3486499f56e487cd6df88a8fa2448ff72d72a1e0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 02:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 309b427..019a3c1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -213,6 +213,9 @@
List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
.eq(YwPoint::getUnitId, unitId)
.like(YwPoint::getPointName, keyword)
+ .or()
+ .eq(YwPoint::getUnitId, unitId)
+ .like(YwPoint::getSerialNumber, keyword)
.list();
List data = list.stream().map(item -> {
Map map = new HashMap<String, Object>();
--
Gitblit v1.8.0