suntianwu 3 éve
szülő
commit
b702aa9882

+ 8 - 1
src/main/java/com/care/bms/service/BmsSysUserService.java

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