Merge branch 'master' into txb

tangxiaobao

2021-08-19 70e63af30affb3dfe68eb92c75802a4acd151383

Merge branch 'master' into txb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -224,6 +224,9 @@
            "<if test='comMngPopulationVO.remark != null and comMngPopulationVO.remark != &quot;&quot;'>" +
            "AND cmp.remark = #{comMngPopulationVO.remark} " +
            " </if> " +
            "<if test='comMngPopulationVO.houseId != null and comMngPopulationVO.houseId != &quot;&quot;'>" +
            "AND cmp.house_id = #{comMngPopulationVO.houseId} " +
            " </if> " +
            " </where>" +
            " order by cmp.create_at desc" +
            "</script>")

 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);