/resi/hall/issue/votinglist议事厅表决中修改

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

@@ -437,14 +437,16 @@ public class IssueServiceImpl implements IssueService {
                         vi.setLongitude(rr == null ? "" : rr.getLongitude());
                         vi.setLatitude(rr == null ? "" : rr.getLatitude());
                         // 赋值话题详情
-                        TopicInfoDTO topicInfoDTO=new TopicInfoDTO();
-                        topicInfoDTO.setTopicId(rr.getTopicId());
-                        topicInfoDTO.setTopicContent(rr.getTopicContent());
-                        topicInfoDTO.setTopicImgs(rr.getTopicImgs());
-                        topicInfoDTO.setTopicVoices(rr.getTopicVoices());
-                        topicInfoDTO.setPublishedUser(rr.getReleaseUserName());
-                        topicInfoDTO.setReleaseTime(rr.getReleaseTime());
-                        vi.setTopicInfo(topicInfoDTO);
+                        if(null!=rr){
+                            TopicInfoDTO topicInfoDTO=new TopicInfoDTO();
+                            topicInfoDTO.setTopicId(rr.getTopicId());
+                            topicInfoDTO.setTopicContent(rr.getTopicContent());
+                            topicInfoDTO.setTopicImgs(rr.getTopicImgs());
+                            topicInfoDTO.setTopicVoices(rr.getTopicVoices());
+                            topicInfoDTO.setPublishedUser(rr.getReleaseUserName());
+                            topicInfoDTO.setReleaseTime(rr.getReleaseTime());
+                            vi.setTopicInfo(topicInfoDTO);
+                        }
                     });
                 }
             }