From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 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 886420a..005eb40 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
@@ -349,23 +349,28 @@
BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO);
comActDiscussOptionVO.setNum(selectCount);
- //判断选项是否已投票
- int haveVote=comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(),loginUserId);
- comActDiscussOptionVO.setHaveVote(haveVote>0?1:0);
+ if(loginUserId != null){
+ //判断选项是否已投票
+ int haveVote=comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(),loginUserId);
+ comActDiscussOptionVO.setHaveVote(haveVote>0?1:0);
+ }
comActDiscussOptionVOS.add(comActDiscussOptionVO);
});
comActDiscussOptionVOS.sort(Comparator.comparing(ComActDiscussOptionVO::getNum).reversed());
comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
}
- 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);
+
+ if(loginUserId != null){
+ 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);
}
-// 判断是否已经投票
- int haveVote=comActDiscussOptionUserDAO.selectHaveVote(id,loginUserId);
- comActDiscussVO.setHaveVote(haveVote>0?1:0);
});
}
return R.ok(iPage);
@@ -437,20 +442,25 @@
comActDiscussCommentVO1.setUserNameBack(userName);
comActDiscussCommentVO1.setUserNickNameBack(userNickName);
}
- Integer integer = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO1.getId()).eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
- if (integer>0) {
- comActDiscussCommentVO1.setHaveSign(1);
- }else {
- comActDiscussCommentVO1.setHaveSign(0);
+ if(pageComActDiscussCommentDTO.getLoginUserId() != null && !pageComActDiscussCommentDTO.getLoginUserId().equals(0L)){
+ Integer integer = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO1.getId()).eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
+ if (integer>0) {
+ comActDiscussCommentVO1.setHaveSign(1);
+ }else {
+ comActDiscussCommentVO1.setHaveSign(0);
+ }
}
+
});
comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
}
- Integer integer = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO.getId()).eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
- if (integer>0) {
- comActDiscussCommentVO.setHaveSign(1);
- }else {
- comActDiscussCommentVO.setHaveSign(0);
+ if(pageComActDiscussCommentDTO.getLoginUserId() != null && !pageComActDiscussCommentDTO.getLoginUserId().equals(0L)){
+ Integer integer = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, comActDiscussCommentVO.getId()).eq(ComActDiscussCommentUserDO::getUserId, pageComActDiscussCommentDTO.getLoginUserId()));
+ if (integer>0) {
+ comActDiscussCommentVO.setHaveSign(1);
+ }else {
+ comActDiscussCommentVO.setHaveSign(0);
+ }
}
//判断当前评论是否是社区管理员评论
@@ -491,9 +501,11 @@
ComActDiscussOptionVO comActDiscussOptionVO=new ComActDiscussOptionVO();
BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO);
comActDiscussOptionVO.setNum(selectCount);
- //判断选项是否已投票
- int haveVote=comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(),loginUserId);
- comActDiscussOptionVO.setHaveVote(haveVote>0?1:0);
+ if(loginUserId != null && !loginUserId.equals(0L)){
+ //判断选项是否已投票
+ int haveVote=comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(),loginUserId);
+ comActDiscussOptionVO.setHaveVote(haveVote>0?1:0);
+ }
comActDiscussOptionVOS.add(comActDiscussOptionVO);
});
comActDiscussOptionVOS.sort(Comparator.comparing(ComActDiscussOptionVO::getNum).reversed());
@@ -517,9 +529,12 @@
ComActVO comActVO=comActDiscussDAO.selectCommunity(communityId);
comActDiscussVO.setUserName(comActVO.getName());
}
- ComActDiscussVO comActDiscussVO1=comActDiscussDAO.selectHaveSignAndHaveVote(id,loginUserId);
- comActDiscussVO.setHaveSign(comActDiscussVO1.getHaveSign());
- comActDiscussVO.setHaveVote(comActDiscussVO1.getHaveVote());
+ if(loginUserId != null && !loginUserId.equals(0L)){
+ ComActDiscussVO comActDiscussVO1=comActDiscussDAO.selectHaveSignAndHaveVote(id,loginUserId);
+ comActDiscussVO.setHaveSign(comActDiscussVO1.getHaveSign());
+ comActDiscussVO.setHaveVote(comActDiscussVO1.getHaveVote());
+ }
+
return R.ok(comActDiscussVO);
}
--
Gitblit v1.7.1