diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index fff75265a7..f10c4bb617 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -539,8 +539,24 @@ public class ResiTopicServiceImpl extends BaseServiceImpl 0) { //2. 在缓存中拉取用户信息 - setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics); - +// setCacheUserInfoWithIssue(topicPageFormDTO.getGroupId(), pastTopics); + ResiGroupEntity resiGroup = resiGroupDao.selectById(topicPageFormDTO.getGroupId()); + if(null == resiGroup){ + throw new RenException("此小组信息不存在"); + } + List userIds = pastTopics.stream().map(m -> m.getUserId()).collect(Collectors.toList()); + List userInfos = disPoseUserInfo(resiGroup.getGroupType(), userIds); + if (CollectionUtils.isEmpty(userInfos)){ + throw new RenException("未查询到用户信息"); + } + pastTopics.forEach(t -> { + userInfos.forEach(u -> { + if (t.getUserId().equals(u.getUserId())){ + t.setReleaseUserName(u.getReleaseUserName()); + t.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto()); + } + }); + }); //3.用户徽章 //3.1首先需要拿到客户Id List other = pastTopics.stream() diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java index 0e5cd22fef..0bada1c5ee 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java @@ -51,7 +51,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{ private List userRoleList; /** - * + * XX街道-Y先生/女士 如果是未认证居民,这一列为空 */ private String userStreetName; + /** + * XX街道-YYY 如果是未认证居民,这一列为空 + */ + private String userStreetTrueName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 8c6c448689..e2aaae2963 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -273,6 +273,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl