Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -785,13 +785,25 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         resultDTO.setTopicImgs(attachmentUrls);
 
         //3.拿取用户信息
+        ResiGroupEntity group = resiGroupDao.selectById(topicDetail.getGroupId());
+        if ("branch".equals(group.getGroupType())) {
+            List<String> userIds = new ArrayList<>();
+            userIds.add(topicDetail.getCreatedBy());
+            List<UserInfoResultDTO> userInfos = disPoseUserInfo(group.getGroupType(), userIds);
+            userInfos.forEach(u -> {
+                if (topicDetail.getCreatedBy().equals(u.getUserId())) {
+                    resultDTO.setReleaseUserName(StringUtils.isBlank(u.getReleaseUserName()) ? "" : u.getReleaseUserName());
+                    resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(u.getReleaseUserHeadPhoto()) ? "" : u.getReleaseUserHeadPhoto());
+                }
+            });
 
-        //ResiGroupEntity group = resiGroupDao.selectById(topicDetail.getGroupId());
-        ResiGroupMemberInfoRedisDTO memberRedis =
-        resiGroupMemberRedis.get(topicDetail.getGroupId(),topicDetail.getCreatedBy());
-        if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
-            resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
-            resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto());
+        } else {
+            ResiGroupMemberInfoRedisDTO memberRedis =
+                    resiGroupMemberRedis.get(topicDetail.getGroupId(), topicDetail.getCreatedBy());
+            if (null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())) {
+                resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
+                resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto());
+            }
         }
 
         //4.话题关闭详情