议题详情议题人取成话题人问题

epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -94,7 +94,7 @@ public class IssueServiceImpl implements IssueService {
             issueDetailResult.setTopicInfo(topicInfoDTOResult == null ? new TopicInfoDTO() : topicInfoDTOResult);
         }
 
-        /*if("branch".equals(topicInfoDTOResult.getGroupType())){//支部小组话题发起人显示真实姓名
+        if (null != topicInfoDTOResult && "branch".equals(topicInfoDTOResult.getGroupType())) {//支部小组话题发起人显示真实姓名
             List<String> userIdList = new ArrayList<>();
             userIdList.add(issueResult.getUserId());
             Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
@@ -118,8 +118,8 @@ public class IssueServiceImpl implements IssueService {
                 IssueInitiatorResultDTO initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO).getData();
                 issueDetailResult.setIssueInitiator(initiatorResult == null ? HallConstat.NULL_CHARACTER_STRING : initiatorResult.getIssueInitiator());
             }
-        }*/
-        issueDetailResult.setIssueInitiator(topicInfoDTOResult.getPublishedUser());
+        }
+        //issueDetailResult.setIssueInitiator(topicInfoDTOResult.getPublishedUser());
 
         //判断是否投票
         CheckVoteFormDTO formDTO = new CheckVoteFormDTO();