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

huanghongfa

2021-07-16 a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07

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

@@ -452,6 +452,10 @@
                    comActDiscussCommentVO.setHaveSign(0);
                }

                //判断当前评论是否是社区管理员评论
                if(!comActDiscussCommentVO.getUserType().equals(1)){
                    comActDiscussCommentVO.setUserNickName("社区管理员");
                }
            });
        }
        return R.ok(iPage);
@@ -500,6 +504,7 @@
            comActDiscussVO.setUserName(loginUserInfoVO.getName());
            comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
            comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
            comActDiscussVO.setUserType(loginUserInfoVO.getType());
        }
        Long communityId = comActDiscussDO.getCommunityId();
        Integer type1 = loginUserInfoVO.getType();