From 29c3367d8c8f9777bde6a86fa26c86d19a35bc07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 15:18:25 +0800
Subject: [PATCH] Merge branch 'zzj' of http://182.151.2.19:9380/root/zhihuishequ into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 92 ++++++++++++++++++++++++++++++----------------
1 files changed, 60 insertions(+), 32 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 4a64407..6328de8 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
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
@@ -348,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);
@@ -436,22 +442,33 @@
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);
+ }
+ }
+ if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
+ comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
}
});
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);
+ }
}
+ //判断当前评论是否是社区管理员评论
+ if(!comActDiscussCommentVO.getUserType().equals(1)){
+ comActDiscussCommentVO.setUserNickName("社区管理员");
+ }
});
}
return R.ok(iPage);
@@ -486,9 +503,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());
@@ -498,18 +517,27 @@
LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId);
if(loginUserInfoVO != null){
comActDiscussVO.setUserName(loginUserInfoVO.getName());
- comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
+ if(StringUtils.isEmpty(loginUserInfoVO.getNickName())){
+ comActDiscussVO.setUserNickName(loginUserInfoVO.getName());
+ }else{
+ comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
+ }
comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
+ comActDiscussVO.setUserType(loginUserInfoVO.getType());
}
Long communityId = comActDiscussDO.getCommunityId();
Integer type1 = loginUserInfoVO.getType();
if (type1.intValue()>1) {
ComActVO comActVO=comActDiscussDAO.selectCommunity(communityId);
comActDiscussVO.setUserName(comActVO.getName());
+ comActDiscussVO.setUserNickName(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);
}
@@ -527,10 +555,10 @@
if (ObjectUtils.isEmpty(comActDiscussOptionDO)) {
return R.fail("选项不存在");
}
- Long discussId = comActDiscussOptionDO.getDiscussId();
- List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, discussId));
- List<Long> longList=comActDiscussOptionDOS.stream().map(comActDiscussOptionDO1 -> comActDiscussOptionDO1.getId()).collect(Collectors.toList());
- Integer integer = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getUserId, userId).in(ComActDiscussOptionUserDO::getDiscussOptionId, longList));
+// Long discussId = comActDiscussOptionDO.getDiscussId();
+// List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, discussId));
+// List<Long> longList=comActDiscussOptionDOS.stream().map(comActDiscussOptionDO1 -> comActDiscussOptionDO1.getId()).collect(Collectors.toList());
+ Integer integer = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getUserId, userId).eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionId));
if (integer>0) {
return R.fail("不要重复投票");
}
--
Gitblit v1.7.1