From cb901a57b73663ebf654741118848d00f7674040 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 27 Apr 2021 16:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=20=E8=AF=9D=E9=A2=98=20=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TopicDraftServiceImpl.java   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index ae899e3ee9..8b800af1b5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -697,13 +697,29 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         result.setVoiceList(voiceUrls);
 
         //3.拿取用户信息
-        ResiGroupMemberInfoRedisDTO memberRedis =
+        /*ResiGroupMemberInfoRedisDTO memberRedis =
                 resiGroupMemberRedis.get(entity.getGroupId(),entity.getCreatedBy());
         if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
             result.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
             result.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto());
+        }*/
+        // 查询小组类型，并且根据类型赋值用户姓名
+        ResiGroupEntity resiGroup = resiGroupDao.selectById(entity.getGroupId());
+        if (null == resiGroup){
+            throw new RenException("此小组信息不存在");
         }
-
+        List<String> userIds = new ArrayList<>();
+        userIds.add(entity.getCreatedBy());
+        List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIds);
+        if (CollectionUtils.isEmpty(userInfos)){
+            throw new RenException("未查询到用户信息");
+        }
+        userInfos.forEach(u -> {
+            if (u.getUserId().equals(entity.getCreatedBy())){
+                result.setReleaseUserName(u.getReleaseUserName());
+                result.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto());
+            }
+        });
         return result;
     }