diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 3455d2d67c..adae13856f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -312,7 +312,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             //2.2查询话题相关信息
             Result<GovTopicIssueInfoResultDTO> topicResult =
             resiGroupFeignClient.topicInfoForIssueDetailGov(topicParam);
-            if(topicResult.success() || null != topicResult.getData()){
+            if(topicResult.success() && null != topicResult.getData()){
                 GovTopicOfIssueInfoResultDTO topicInfo = ConvertUtils.sourceToTarget(topicResult.getData(),GovTopicOfIssueInfoResultDTO.class);
                 GovIssueDetailResultDTO issueInfo = ConvertUtils.sourceToTarget(topicResult.getData(),GovIssueDetailResultDTO.class);
                 issueInfo.setIssueStatus(issueDetail.getIssueStatus());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
index 32f33251d2..e557f84fb5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
@@ -421,7 +421,7 @@
 							attachment.ATTACHMENT_URL
 							FROM
 							resi_topic topic
-							INNER JOIN
+							LEFT JOIN
 							resi_topic_attachment attachment
 							ON
 							topic.ID = attachment.TOPIC_ID