From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 24 九月 2024 09:15:08 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java index 12f2c3e..0992819 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; import com.doumee.dao.business.DeviceMapper; import com.doumee.dao.business.model.Device; @@ -90,11 +91,9 @@ public List<Device> findIdAndNameList(Device param) { LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param); 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()) - .eq(Device::getHkStatus,param.getHkStatus()); - } + wrapper.eq(null != param.getType(),Device::getType,param.getType()) + .eq(null !=param.getIsdeleted(),Device::getIsdeleted,param.getIsdeleted()) + .eq(null != param.getHkStatus(),Device::getHkStatus,param.getHkStatus()); return deviceMapper.selectList(wrapper); } @@ -102,6 +101,7 @@ public PageData<Device> findPage(PageWrap<Device> pageWrap) { IPage<Device> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); QueryWrapper<Device> queryWrapper = new QueryWrapper<>(); + pageWrap.getModel().setIsdeleted(Constants.ZERO); Utils.MP.blankToNull(pageWrap.getModel()); if (pageWrap.getModel().getId() != null) { queryWrapper.lambda().eq(Device::getId, pageWrap.getModel().getId()); -- Gitblit v1.9.3