From 70b2473890b05238069ba058d19af6aa7bb0f35a Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 27 Apr 2021 15:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8C=89=E7=BB=84=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

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 e7a6e1ad55..2a3bb864d6 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
@@ -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.话题关闭详情