Merge branch 'dev_bugfix' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -45,6 +45,7 @@ import com.epmet.feign.ResiGroupFeignClient;
 import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.redis.IssueVoteStatisticalRedis;
 import com.epmet.resi.group.dto.topic.form.MyPartIssueFormDTO;
+import com.epmet.resi.group.dto.topic.form.TopicIdListFormDTO;
 import com.epmet.resi.group.dto.topic.result.MyPartIssueResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.IssueVoteDetailService;
@@ -550,13 +551,23 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     @Override
     public List<MyPartIssuesResultDTO> myPartIssues(MyPartIssuesFormDTO myPartIssuesFormDTO) {
         List<MyPartIssuesResultDTO> myPartIssuesResult = new ArrayList<>();
+        //我创建的话题
+        TopicIdListFormDTO topicIdListFormDTO = new TopicIdListFormDTO();
+        topicIdListFormDTO.setUserId(myPartIssuesFormDTO.getUserId());
+        Result<List<String>> myCreateIssueResult = resiGroupOpenFeignClient.selectMyCreateTopic(topicIdListFormDTO);
+        if (!myCreateIssueResult.success()){
+            throw new RenException("查询我创建的话题失败......");
+        }
+        //我参与的议题
+        myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myCreateIssueResult.getData());
+        //我参与的话题
         MyPartIssueFormDTO formDTO = new MyPartIssueFormDTO();
         formDTO.setUserId(myPartIssuesFormDTO.getUserId());
         Result<MyPartIssueResultDTO> myPartIssueResult = resiGroupOpenFeignClient.selectMyPartTopic(formDTO);
         if (!myPartIssueResult.success()){
             throw new RenException("查询我评论过的话题失败......");
         }
-        myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myPartIssueResult.getData().getTopicIds());
+        //我参与的话题转了议题的
         if (!CollectionUtils.isEmpty(myPartIssueResult.getData().getTopicIds())){
             List<MyPartIssuesResultDTO> myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds());
             myPartIssuesResult.addAll(myPartIssues);