From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 17:45:33 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..285a0d1 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
@@ -93,11 +93,12 @@
@Override
public Device findOne(Device device) {
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
- return deviceMapper.selectOne(wrapper);
+ return deviceMapper.selectOne(wrapper.last("limit 1"));
}
@Override
public List<Device> findList(Device device) {
+ device.setIsdeleted(Constants.ZERO);
QueryWrapper<Device> wrapper = new QueryWrapper<>(device);
return deviceMapper.selectList(wrapper);
}
@@ -105,7 +106,8 @@
@Override
public List<Device> findIdAndNameList(Device param) {
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
- wrapper.select(Device::getId, Device::getName);
+ param.setIsdeleted(Constants.ZERO);
+ 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())
@@ -119,6 +121,7 @@
IPage<Device> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Device::getId, pageWrap.getModel().getId());
}
@@ -142,8 +145,20 @@
if (pageWrap.getModel().getRemark() != null) {
queryWrapper.lambda().eq(Device::getRemark, pageWrap.getModel().getRemark());
}
+ if (pageWrap.getModel().getIsEntrance() != null) {
+ queryWrapper.lambda().eq(Device::getIsEntrance, pageWrap.getModel().getIsEntrance());
+ }
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