Browse Source

我参与的议题-修改

dev_shibei_match
zhaoqifeng 5 years ago
parent
commit
c0eca257d7
  1. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
  2. 8
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

2
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()){ if (!myPartIssueResult.success()){
throw new RenException("查询我评论过的话题失败......"); throw new RenException("查询我评论过的话题失败......");
} }
myPartIssuesResult = issueVoteDetailDao.myPartIssues(myPartIssuesFormDTO.getUserId(), myPartIssueResult.getData().getTopicIds());
if (!CollectionUtils.isEmpty(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()); List<MyPartIssuesResultDTO> myPartIssues = issueVoteDetailDao.myPartIssuesByTopicId(myPartIssueResult.getData().getTopicIds());
myPartIssuesResult.addAll(myPartIssues); myPartIssuesResult.addAll(myPartIssues);
} }

8
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@ -85,9 +85,11 @@
WHERE i.DEL_FLAG = '0' WHERE i.DEL_FLAG = '0'
AND vd.DEL_FLAG = '0' AND vd.DEL_FLAG = '0'
AND vd.CREATED_BY = #{userId} AND vd.CREATED_BY = #{userId}
<foreach collection="topicIds" item="topicId" open="AND (" separator="AND" close=")"> <if test='null!=topicIds and topicIds.size()>0'>
i.SOURCE_ID != #{topicId} <foreach collection="topicIds" item="topicId" open="AND (" separator="AND" close=")">
</foreach> i.SOURCE_ID != #{topicId}
</foreach>
</if>
ORDER BY i.CREATED_TIME DESC ORDER BY i.CREATED_TIME DESC
</select> </select>

Loading…
Cancel
Save