二期 后台 bug

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -225,7 +225,12 @@ public class BmsSysUserService{
             freeDeviceList.forEach(item ->{
                 DeviceVO deviceVO = new DeviceVO();
                 BeanUtil.copyProperties(item,deviceVO);
-                deviceVO.setHouseAddr(careHouseService.getById(deviceVO.getHouseId()).getAddr());
+                if (deviceVO.getHouseId() !=null) {
+                    CareHouse careHouse = careHouseService.getById(deviceVO.getHouseId() );
+                     if(careHouse != null) {
+                         deviceVO.setHouseAddr(careHouse.getAddr());
+                     }
+                }
                 freeDeviceVOList.add(deviceVO);
             });
         }