|
|
@ -1036,14 +1036,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
OwnerRelationResultDTO result = new OwnerRelationResultDTO(); |
|
|
|
//获取用户信息
|
|
|
|
IcResiUserEntity user = baseDao.selectById(userId); |
|
|
|
|
|
|
|
//获取用户所在家庭的户主
|
|
|
|
Result<IcHouseDTO> houseResult = govOrgOpenFeignClient.get(user.getHomeId()); |
|
|
|
if (!houseResult.success()) { |
|
|
|
throw new RenException(houseResult.getCode(),houseResult.getMsg()); |
|
|
|
} |
|
|
|
result.setOwnerName(houseResult.getData().getOwnerName()); |
|
|
|
|
|
|
|
result.setOwnerName(""); |
|
|
|
//获取用户所在家庭里所有人员信息
|
|
|
|
LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>(); |
|
|
|
wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); |
|
|
@ -1057,6 +1050,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi |
|
|
|
if (userId.equals(item.getId())) { |
|
|
|
bean.setIsSelf(NumConstant.ONE_STR); |
|
|
|
} |
|
|
|
//如果与房主的关系是本人,则这个人就是房主
|
|
|
|
if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) { |
|
|
|
result.setOwnerName(item.getName()); |
|
|
|
} |
|
|
|
return bean; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
result.setUserList(userList); |
|
|
|