设备不填充其他其他信息时 详情不报错

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -113,11 +113,14 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
     public PlatDeviceViewVO view(String id) {
     public PlatDeviceViewVO view(String id) {
         PlatDevice db = getById(id);
         PlatDevice db = getById(id);
 
 
+        PlatDeviceViewVO vo = BeanDtoVoUtils.convert(db, PlatDeviceViewVO.class);
+
         PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
         PlatDeviceOther other = platDeviceOtherService.getOne(new QueryWrapper<PlatDeviceOther>().lambda()
                 .eq(PlatDeviceOther::getDeviceId, id));
                 .eq(PlatDeviceOther::getDeviceId, id));
 
 
-        PlatDeviceViewVO vo = BeanDtoVoUtils.convert(db, PlatDeviceViewVO.class);
-        BeanUtils.copyProperties(other, vo);
+        if (other != null) {
+            BeanUtils.copyProperties(other, vo);
+        }
 
 
         vo.setId(db.getId());
         vo.setId(db.getId());