From f9bf6830debbe4f7486add9d99ecbbc0d67c13cd Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:10:13 +0800
Subject: [PATCH] 最新版本

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 591a1b2..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,6 +106,7 @@
     @Override
     public List<Device> findIdAndNameList(Device param) {
         LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>(param);
+        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())
@@ -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());
         }

--
Gitblit v1.9.3