From 3db20811b0f38d9dd314cf7eae9dc1f640842c86 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 28 Apr 2021 14:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=B1=8F=E8=94=BD=E8=AF=9D=E9=A2=98?=
 =?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=E5=9B=9E=E7=9C=9F=E5=AE=9E=E4=BA=BA=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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 abecb8e4e6..bac53dbb6a 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
@@ -1141,9 +1141,26 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                         );
                     });
 
-                } else pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                } else {
+                    pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                }
 
             }
+
+            //支部小组人员返真实姓名
+            ResiGroupEntity entity = resiGroupDao.selectById(topicPageFormDTO.getGroupId());
+            if("".equals(entity.getGroupType())){
+                List<String> userIds = pastTopics.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList());
+                List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(entity.getGroupType(), userIds);
+                pastTopics.forEach(item -> {
+                    userInfos.forEach(u->{
+                        if(item.getUserId().equals(u.getUserId())){
+                            item.setReleaseUserName(u.getReleaseUserName());
+                        }
+                    });
+                });
+            }
+
         }
         return new Result<List<ResiTopicInfoResultDTO>>().ok(pastTopics);