|
@@ -107,8 +107,10 @@ public class PinanbaoDeviceService {
|
|
|
DeviceVO vo = new DeviceVO();
|
|
|
BeanUtil.copyProperties(careDevice,vo);
|
|
|
CareSysUser chamb = this.careSysUserService.getById(vo.getChambId());
|
|
|
- vo.setChambName(chamb.getName());
|
|
|
- vo.setChambPhone(chamb.getPhone());
|
|
|
+ if(chamb != null) {
|
|
|
+ vo.setChambName(chamb.getName());
|
|
|
+ vo.setChambPhone(chamb.getPhone());
|
|
|
+ }
|
|
|
vo.setStationName(this.careStationService.getById(vo.getStationId()).getShortName());
|
|
|
vo.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(vo.getActiveStatus()));
|
|
|
vo.setStatusName(DeviceStatusEnum.getCodeToName(vo.getStatus()));
|