|
@@ -185,7 +185,14 @@ public class BmsSysUserService{
|
|
hasDeviceList.forEach(item ->{
|
|
hasDeviceList.forEach(item ->{
|
|
DeviceVO deviceVO = new DeviceVO();
|
|
DeviceVO deviceVO = new DeviceVO();
|
|
BeanUtil.copyProperties(item,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());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
hasDeviceVOList.add(deviceVO);
|
|
hasDeviceVOList.add(deviceVO);
|
|
});
|
|
});
|
|
resVO.setHasDeviceVOList(hasDeviceVOList);
|
|
resVO.setHasDeviceVOList(hasDeviceVOList);
|