Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-19 00988c615003cc247630c2b080724af6c2bd1c3c

Merge remote-tracking branch 'origin/test' into test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java

@@ -450,7 +450,9 @@
                                comActDiscussCommentVO1.setHaveSign(0);
                            }
                        }

                        if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
                        }
                    });
                    comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
                }
@@ -528,6 +530,7 @@
        if (type1.intValue()>1) {
            ComActVO comActVO=comActDiscussDAO.selectCommunity(communityId);
            comActDiscussVO.setUserName(comActVO.getName());
            comActDiscussVO.setUserNickName(comActVO.getName());
        }
        if(loginUserId != null && !loginUserId.equals(0L)){
            ComActDiscussVO comActDiscussVO1=comActDiscussDAO.selectHaveSignAndHaveVote(id,loginUserId);