|
@@ -172,7 +172,9 @@ public class PinanbaoDeviceService {
|
|
|
public List<OlderVO> queryMyOlderListByDeviceId(Long devId){
|
|
|
List<OlderVO> vos = Lists.newArrayList();
|
|
|
CareDevice careDevice = this.careDeviceService.getById(devId);
|
|
|
-
|
|
|
+ if(careDevice == null){
|
|
|
+ return vos;
|
|
|
+ }
|
|
|
QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId, careDevice.getHouseId());
|
|
|
List<CareHouseOlderRel> rels = this.careHouseOlderRelService.list(queryWrapper);
|
|
@@ -197,7 +199,9 @@ public class PinanbaoDeviceService {
|
|
|
public List<HouseContactVO> queryMyContactListByDeviceId(Long devId){
|
|
|
List<HouseContactVO> vos = Lists.newArrayList();
|
|
|
CareDevice careDevice = this.careDeviceService.getById(devId);
|
|
|
-
|
|
|
+ if(careDevice == null){
|
|
|
+ return vos;
|
|
|
+ }
|
|
|
QueryWrapper<CareHouseContactRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.lambda().eq(CareHouseContactRel::getHouseId, careDevice.getHouseId());
|
|
|
List<CareHouseContactRel> rels = this.careHouseContactRelService.list(queryWrapper);
|