浏览代码

二期 频安宝 bug

suntianwu 3 年之前
父节点
当前提交
be3612ac20
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      src/main/java/com/care/client/service/PinanbaoDeviceService.java

+ 6 - 2
src/main/java/com/care/client/service/PinanbaoDeviceService.java

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