From 33327a22413b11de8959d67e4527265568c45c1a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 13:35:20 +0800 Subject: [PATCH] =?UTF-8?q?showName=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/impl/ResiGroupServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 90b12f3dad..7980a41f14 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -354,10 +354,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl(); } + // 查询小组信息，为了拿小组的类型，是支部还是楼院 + ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId); UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO(); resiUserInfoFormDTO.setCustomerId(customerId); resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId()); - return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + Result userResiInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); + if (!userResiInfo.success()){ + throw new RenException("根据组id查询组长信息失败了"); + } + if (null != resiGroup && ModuleConstant.GROUP_TYPE_BRANCH.equals(resiGroup.getGroupType())){ + UserResiInfoResultDTO data = userResiInfo.getData(); + userResiInfo.getData().setShowName(data.getStreet()+"-"+data.getSurname()+data.getName()); + } + return userResiInfo; } /**