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

huanghongfa

2021-04-29 131aa1302bd7edab443f01800e322602d1b269ea

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

@@ -1,9 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleCommentReplyAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

@@ -28,4 +32,15 @@
            " </script>")
    List<ComActNeighborCircleCommentReplyAppVO> getCircleCommentReplyList(@Param("commentId") Long commentId);

    @Select("<script> " +
            "select cr.*,u.name as userName from com_act_neighbor_circle_comment_reply cr left join sys_user u on cr.user_id=u.user_id  " +
            "<where>"+
            "<if test='dto.id != null and pageActWorkGuideDTO.dto!= 0l'>" +
            "comment_id = #{dto.id}"+
            " </if> " +
            "</where>"+
            " ORDER BY create_at"+
            "</script>")
    Page<ComActNeighborCommentReplyByAdminVO> selectListByComment(Page<ComActNeighborCircleCommentReplyDO> page, DetailNeighborCommentReplyByAdminDTO dto);

}