From a34374d01db2e50ba4c81f84b91a4ff9810505f5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 27 Apr 2021 13:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2-?=
 =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8/=E5=B7=B2=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=BB=84=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=BF=94=E4=BA=BA=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TopicDraftServiceImpl.java   | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 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 25a226886a..7a23edc9cd 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
@@ -38,6 +38,7 @@ import com.epmet.commons.tools.scan.result.VoiceResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
+import com.epmet.dto.result.UserInfoResultDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.dao.GroupMessageDao;
@@ -148,6 +149,8 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
     private String voiceResultsMethod;
     @Autowired
     private GroupMessageDao groupMessageDao;
+    @Autowired
+    private ResiTopicServiceImpl resiTopicServiceImpl;
 
     @Override
     public PageData<TopicDraftDTO> page(Map<String, Object> params) {
@@ -630,13 +633,27 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         } else {
             result = baseDao.selectTopicDraftByGroup(formDTO.getGroupId(), formDTO.getStatus());
         }
-        result.forEach(item -> {
-            ResiGroupMemberInfoRedisDTO memberRedis =
-                    resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
-            if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
-                item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
-            }
-        });
+        //查询小组信息
+        ResiGroupEntity group = resiGroupDao.selectById(formDTO.getGroupId());
+        if ("branch".equals(group.getGroupType())) {
+            List<String> userIds = result.stream().map(m -> m.getUserName()).distinct().collect(Collectors.toList());
+            List<UserInfoResultDTO> userInfos = resiTopicServiceImpl.disPoseUserInfo(group.getGroupType(), userIds);
+            result.forEach(item -> {
+                userInfos.forEach(u->{
+                    if(item.getUserName().equals(u.getUserId())){
+                        item.setUserName(u.getReleaseUserName());
+                    }
+                });
+            });
+        } else {
+            result.forEach(item -> {
+                ResiGroupMemberInfoRedisDTO memberRedis =
+                        resiGroupMemberRedis.get(formDTO.getGroupId(),item.getUserName());
+                if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){
+                    item.setUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName());
+                }
+            });
+        }
         return result;
     }