From 4aadcd3435ca8fe5f123a38ad4b2a123e05234dc Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 14 Aug 2025 10:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/nuBaseInfo/controller/NuBaseInfoController.java | 3 ++- .../nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java index 2243dd7..11802a3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBaseInfo/controller/NuBaseInfoController.java @@ -68,10 +68,11 @@ public class NuBaseInfoController extends JeecgController> qyList(NuBaseInfo nuBaseInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "pageSize", defaultValue = "15") Integer pageSize, HttpServletRequest req) { Map customeRuleMap = new HashMap<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); + queryWrapper.isNotNull("b.id"); Page page = new Page(pageNo, pageSize); IPage pageList = nuBaseInfoService.qyList(page, queryWrapper); return Result.OK(pageList); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index 82addc1..94e3209 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -28,7 +28,8 @@ record_plan_id as recordPlanId, a.nu_id as nuId, b.nu_name as nuName, - ifnull(c.multitrans,0) as multitrans + ifnull(c.multitrans,0) as multitrans, + a.sn from nu_iot_tplink_camera a left join nu_base_info b on a.nu_id = b.nu_id left join nu_iot_tplink_camera_capability c on a.device_index = c.device_index