Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -954,12 +954,20 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if(null != records && records.size() > NumConstant.ZERO){
                 hiddenDetailDTO.setHiddenReason(String.format("%s%s",ModuleConstant.HIDDEN_TOPIC_REASON_PREFIX,records.get(0).getOperationReason()));
                 hiddenDetailDTO.setHiddenDateTime(records.get(0).getCreatedTime().getTime()/NumConstant.ONE_THOUSAND);
-                ResiGroupMemberInfoRedisDTO hiddenBy =
+                List<String> userIds = new ArrayList<>();
+                userIds.add(records.get(0).getCreatedBy());
+                List<UserInfoResultDTO> userInfos = disPoseUserInfo(group.getGroupType(), userIds);
+                if (CollectionUtils.isEmpty(userInfos)){
+                    throw new RenException("未查询到用户信息");
+                }
+                hiddenDetailDTO.setOperateUserName(userInfos.get(NumConstant.ZERO).getUserId());
+                hiddenDetailDTO.setOperateUserHeadPhoto(userInfos.get(NumConstant.ZERO).getReleaseUserHeadPhoto());
+                /*ResiGroupMemberInfoRedisDTO hiddenBy =
                         resiGroupMemberRedis.get(topicDetail.getGroupId(),records.get(0).getCreatedBy());
                 if (null != hiddenBy && StringUtils.isNotBlank(hiddenBy.getUserShowName())) {
                     hiddenDetailDTO.setOperateUserName(hiddenBy.getUserShowName());
                     hiddenDetailDTO.setOperateUserHeadPhoto(hiddenBy.getUserHeadPhoto());
-                }
+                }*/
                 resultDTO.setHiddenDetail(hiddenDetailDTO);
             }
         }