From 9812ea838a9b5779455428ebe8f4d66f09f61e82 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 27 一月 2021 10:16:43 +0800
Subject: [PATCH] 社区活动

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
index 04bbbae..1637fba 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -318,6 +318,7 @@
         Page page = new Page<>();
         Long pageNum = pageComActDiscussDTO.getPageNum();
         Long pageSize = pageComActDiscussDTO.getPageSize();
+        Long loginUserId = pageComActDiscussDTO.getLoginUserId();
         if (null==pageNum||0==pageNum) {
             pageNum = 1l;
         }
@@ -345,12 +346,15 @@
                     });
                     comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
                 }
-                Integer integer = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, comActDiscussVO.getId()).eq(ComActDiscussUserDO::getUserId, pageComActDiscussDTO.getLoginUserId()));
+                Integer integer = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, comActDiscussVO.getId()).eq(ComActDiscussUserDO::getUserId, loginUserId));
                 if (integer>0) {
                     comActDiscussVO.setHaveSign(1);
                 }else{
                     comActDiscussVO.setHaveSign(0);
                 }
+//                判断是否已经投票
+                int haveVote=comActDiscussOptionUserDAO.selectHaveVote(id,loginUserId);
+                comActDiscussVO.setHaveVote(haveVote>0?1:0);
             });
         }
         return R.ok(iPage);

--
Gitblit v1.7.1