fix:设备分页查询接口修复

swb

2024-08-26 346bf9fc793f188caca408532265f8f862a23ff4

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -291,6 +291,9 @@
            queryWrapper.eq("monitor_point_id", mpId);
        }

        //过滤已删除的数据
        queryWrapper.eq("is_delete", Constants.NOT_DELETE);

        //设备名称或mac模糊查询
        if (name != null && mac != null) {
            queryWrapper.like("name", name).or().like("mac", mac);
@@ -306,7 +309,7 @@
        } else {
            queryWrapper.orderByDesc("create_time");
        }
        queryWrapper.eq("is_delete", Constants.NOT_DELETE);

        Page<Device> devicePage = new Page<>(page, size);
        deviceMapper.selectPage(devicePage, queryWrapper);
        List<Device> devices = devicePage.getRecords();