diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index 31974367..98b4ed29 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -431,7 +431,9 @@ public class CameraInfoServiceImpl extends ServiceImpl getCameraInfoList(CameraInfoEntity cameraInfoEntity) { CameraInfo cameraInfo = new CameraInfo(); - BeanUtils.copyProperties(cameraInfoEntity, cameraInfo); + if(cameraInfoEntity != null){ + BeanUtils.copyProperties(cameraInfoEntity, cameraInfo); + } List list = baseMapper.findAllList(cameraInfo); List listDto = BeanUtil.copyToList(list, CameraInfoEntity.class); return listDto;