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 150dddcb33..e7a6e1ad55 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 @@ -192,6 +192,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl().ok(resultDTO); } @@ -893,8 +898,23 @@ public class ResiTopicServiceImpl extends BaseServiceImpl 0) { - setCacheUserInfo(topicPageFormDTO.getGroupId(), hiddenTopics); - + //获取小组信息 + ResiGroupEntity groupEntity = resiGroupDao.selectById(topicPageFormDTO.getGroupId()); + if ("branch".equals(groupEntity.getGroupType())) { + List userIds = hiddenTopics.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList()); + List userInfos = resiTopicService.disPoseUserInfo(groupEntity.getGroupType(), userIds); + hiddenTopics.forEach(item -> { + userInfos.forEach(u->{ + if(item.getUserId().equals(u.getUserId())){ + //缓存中有该用户信息 + item.setReleaseUserName(u.getReleaseUserName()); + item.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto()); + } + }); + }); + } else { + setCacheUserInfo(topicPageFormDTO.getGroupId(), hiddenTopics); + } //3.用户徽章 //3.1首先需要拿到客户Id @@ -1650,7 +1670,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl