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

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

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

@@ -160,7 +160,7 @@

    /**
     * 一起议-回复
     * 
     *
     * @param comActDiscussCommentDTO
     *            评论内容
     * @return 回复结果
@@ -469,7 +469,9 @@
                            .collect(Collectors.toList());
                        if (!ObjectUtils.isEmpty(collect)) {
                            String userName = collect.get(0).getUserName();
                            String userNickName = collect.get(0).getUserNickName();
                            comActDiscussCommentVO1.setUserNameBack(userName);
                            comActDiscussCommentVO1.setUserNickNameBack(userNickName);
                        }
                        List<ComActDiscussCommentVO> collect1 = records.stream()
                            .filter(comActDiscussCommentVO2 -> comActDiscussCommentVO2.getId().equals(parentId))
@@ -495,9 +497,9 @@
                                comActDiscussCommentVO1.setHaveSign(0);
                            }
                        }
                        if (StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())) {
                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
                        }
//                        if(StringUtils.isEmpty(comActDiscussCommentVO1.getUserNickNameBack())){
//                            comActDiscussCommentVO1.setUserNickNameBack("社区管理员");
//                        }
                    });
                    comActDiscussCommentVO.setComActDiscussCommentVOList(comActDiscussCommentVOList);
                }
@@ -668,7 +670,7 @@

    /**
     * 工作大屏-一起议列表
     * 
     *
     * @param discussListDTO
     *            请求参数
     * @return 一起议列表