Merge branch 'dev' into sky_v2

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/DeviceService.java

@@ -1,6 +1,5 @@
 package com.sckw.slope.detection.service;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.pagehelper.PageHelper;
@@ -186,9 +185,11 @@ public class DeviceService {
 
         KwsDeviceModel deviceModel = deviceModelMapper.selectOne(new LambdaQueryWrapper<KwsDeviceModel>()
                 .eq(KwsDeviceModel::getId, vo.getModelId()));
-        vo.setManufacturer(deviceModel.getManufacturer());
-        vo.setManufacturer_contacts(deviceModel.getManufacturerContacts());
-        vo.setManufacturer_phone(deviceModel.getManufacturerPhone());
+        if (deviceModel!=null){
+            vo.setManufacturer(deviceModel.getManufacturer());
+            vo.setManufacturer_contacts(deviceModel.getManufacturerContacts());
+            vo.setManufacturer_phone(deviceModel.getManufacturerPhone());
+        }
         return HttpResult.ok(vo);
     }