From c0eca257d73998bfc1c983fcc4a5324f258e323e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 26 Nov 2020 10:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98-=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IssueVoteStatisticalServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/IssueVoteDetailDao.xml      | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index ca9959395d..1bd165b71b 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -556,8 +556,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         if (!myPartIssueResult.success()){
             throw new RenException("查询我评论过的话题失败......");
         }
+        myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myPartIssueResult.getData().getTopicIds());
         if (!CollectionUtils.isEmpty(myPartIssueResult.getData().getTopicIds())){
-            myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myPartIssueResult.getData().getTopicIds());
             List<MyPartIssuesResultDTO> myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds());
             myPartIssuesResult.addAll(myPartIssues);
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
index 2368211d6f..f0d4ec2069 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml
@@ -85,9 +85,11 @@
         WHERE i.DEL_FLAG = '0'
               AND vd.DEL_FLAG = '0'
               AND vd.CREATED_BY = #{userId}
-              <foreach collection="topicIds" item="topicId" open="AND  (" separator="AND" close=")">
-                  i.SOURCE_ID != #{topicId}
-              </foreach>
+              <if test='null!=topicIds and topicIds.size()>0'>
+                  <foreach collection="topicIds" item="topicId" open="AND  (" separator="AND" close=")">
+                      i.SOURCE_ID != #{topicId}
+                  </foreach>
+              </if>
               ORDER BY i.CREATED_TIME DESC
     </select>