修复bug

huanghongfa

2021-05-07 6ed8acdea66b78dfa036d00386bc1713f8199c09

修复bug

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java

@@ -48,6 +48,9 @@
    @ApiModelProperty("邻里圈评论回复列表（默认展示2条）")
    private List<ComActNeighborCircleCommentReplyAppVO> circleCommentReplyAppList;

    @ApiModelProperty("邻里圈评论回复数量")
    private Integer commentReplyNum;

    /**
     * 是否已经点赞 1 是 2 否
     */

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

@@ -28,7 +28,7 @@
            " from com_act_neighbor_circle_comment_reply as reply" +
            " left join sys_user su1 on su1.user_id = reply.user_id " +
            " left join sys_user su2 on su2.user_id = reply.parent_user_id " +
            " where reply.comment_id = #{commentId} order by create_at desc limit 2" +
            " where reply.comment_id = #{commentId} order by create_at desc" +
            " </script>")
    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);


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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.Date;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -167,6 +168,8 @@
                //查询评论下评论回复
                List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS = comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
                if(!commentReplyAppVOS.isEmpty()){
                    List<ComActNeighborCircleCommentReplyAppVO> newCommentReplyAppVOS = new ArrayList<>();
                    int i = 0;
                    for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) {
                        //查询点赞信息
                        ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
@@ -179,8 +182,14 @@
                        }else{
                            commentReplyVO.setHaveSign(2);
                        }
                        if(i >= 2){
                            break;
                        }
                        newCommentReplyAppVOS.add(commentReplyVO);
                        i++;
                    }
                    circleCommentVo.setCircleCommentReplyAppList(commentReplyAppVOS);
                    circleCommentVo.setCircleCommentReplyAppList(newCommentReplyAppVOS);
                    circleCommentVo.setCommentReplyNum(commentReplyAppVOS.size());
                }
            }
        }