/gov/issue/issuevotedetail/joinvote调整下

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

@@ -17,6 +17,7 @@
 
 package com.epmet.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -46,6 +47,7 @@ import com.epmet.redis.IssueVoteDetailRedis;
 import com.epmet.service.IssueService;
 import com.epmet.service.IssueVoteDetailService;
 import com.epmet.utils.ModuleConstants;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -207,10 +209,21 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         }else {
             resultDTO.setJoinVote(false);
         }*/
-        IssueVoteDetailDTO issueVoteDetailDTO=baseDao.selectUserIssueDet(checkVoteFormDTO.getUserId(),checkVoteFormDTO.getIssueId());
-        if(null!=issueVoteDetailDTO){
+        // 查询issue_vote_detail 表校验当前用户是否投过票，因为生产数据老是出现一个人多条记录的情况，改用下面的方法
+        // IssueVoteDetailDTO issueVoteDetailDTO=baseDao.selectUserIssueDet(checkVoteFormDTO.getUserId(),checkVoteFormDTO.getIssueId());
+        // if(null!=issueVoteDetailDTO){
+        //     resultDTO.setJoinVote(true);
+        //     resultDTO.setAttitude(issueVoteDetailDTO.getAttitude());
+        //     return resultDTO;
+        // }
+        LambdaQueryWrapper<IssueVoteDetailEntity> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.eq(IssueVoteDetailEntity::getIssueId,checkVoteFormDTO.getIssueId())
+                .eq(IssueVoteDetailEntity::getCreatedBy,checkVoteFormDTO.getUserId())
+                .orderByDesc(IssueVoteDetailEntity::getCreatedTime);
+        List<IssueVoteDetailEntity> list=baseDao.selectList(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list)){
             resultDTO.setJoinVote(true);
-            resultDTO.setAttitude(issueVoteDetailDTO.getAttitude());
+            resultDTO.setAttitude(list.get(0).getAttitude());
             return resultDTO;
         }
         if (issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){