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

@@ -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);