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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -70,8 +70,8 @@
            "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " +
            ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canct.name as topicName " +
            ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " +
            " left join sys_user as su on su.user_id = canc.release_id where id = #{circleId} "+
            " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id" +
            " left join sys_user as su on su.user_id = canc.release_id  "+
            " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id where canc.id = #{circleId}" +
            " </script>")
    ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
    @Select("<script> \n"+
@@ -88,6 +88,9 @@
            "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>" +
            "and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')  \n" +
            " </if> " +
            "<if test='neighborCircleAdminDTO.topicName != null and neighborCircleAdminDTO.topicName != &quot;&quot;'>" +
            "and canct.`name` = #{neighborCircleAdminDTO.topicName}  " +
            " </if> " +
            "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
            "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  \n" +
            " </if> " +