|
@@ -40,9 +40,8 @@ public class PinanbaoContactService {
|
|
*/
|
|
*/
|
|
public List<HouseContactVO> queryContactByMemberId(Long memberId){
|
|
public List<HouseContactVO> queryContactByMemberId(Long memberId){
|
|
List<HouseContactVO> vos = Lists.newArrayList();
|
|
List<HouseContactVO> vos = Lists.newArrayList();
|
|
- CareMemberInfo memberInfo = this.careMemberInfoService.getById(memberId);
|
|
|
|
QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CareHouseContact> queryWrapper = new QueryWrapper<>();
|
|
- queryWrapper.lambda().eq(CareHouseContact::getMemberId, memberInfo.getId())
|
|
|
|
|
|
+ queryWrapper.lambda().eq(CareHouseContact::getMemberId, memberId)
|
|
.orderByAsc(CareHouseContact::getContactLevel);
|
|
.orderByAsc(CareHouseContact::getContactLevel);
|
|
List<CareHouseContact> contacts = this.careHouseContactService.list(queryWrapper);
|
|
List<CareHouseContact> contacts = this.careHouseContactService.list(queryWrapper);
|
|
if (CollUtil.isNotEmpty(contacts)){
|
|
if (CollUtil.isNotEmpty(contacts)){
|
|
@@ -50,6 +49,8 @@ public class PinanbaoContactService {
|
|
HouseContactVO vo = new HouseContactVO();
|
|
HouseContactVO vo = new HouseContactVO();
|
|
BeanUtil.copyProperties(item,vo);
|
|
BeanUtil.copyProperties(item,vo);
|
|
vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
|
|
vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
|
|
|
|
+ vo.setName(item.getContactName());
|
|
|
|
+ vo.setPhone(item.getContactPhone());
|
|
vos.add(vo);
|
|
vos.add(vo);
|
|
});
|
|
});
|
|
}
|
|
}
|