From 384370341c75c0a8ae371f307dffcc83b5258a43 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 11:34:22 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index cdf4578..b983c54 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -105,7 +105,7 @@
@Override
public List<Device> findIdAndNameList(Device param) {
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
- wrapper.select(Device::getId, Device::getName);
+ wrapper.select(Device::getId, Device::getName, Device::getDoorName,Device::getRegionPathName, Device::getRegionName);
if(null != param.getType() && null != param.getIsdeleted() && null != param.getHkStatus()) {
wrapper.eq(Device::getType,param.getType())
.eq(Device::getIsdeleted,param.getIsdeleted())
@@ -143,7 +143,16 @@
queryWrapper.lambda().eq(Device::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Device::getName, pageWrap.getModel().getName());
+ queryWrapper.lambda().like(Device::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getDoorName() != null) {
+ queryWrapper.lambda().like(Device::getDoorName, pageWrap.getModel().getDoorName());
+ }
+ if (pageWrap.getModel().getRegionPathName() != null) {
+ queryWrapper.lambda().like(Device::getRegionPathName, pageWrap.getModel().getRegionPathName());
+ }
+ if (pageWrap.getModel().getRegionName() != null) {
+ queryWrapper.lambda().like(Device::getRegionName, pageWrap.getModel().getRegionName());
}
if (pageWrap.getModel().getHkId() != null) {
queryWrapper.lambda().eq(Device::getHkId, pageWrap.getModel().getHkId());
--
Gitblit v1.9.3