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

peng

2 天以前 463add4ee035938f9622a6c981668620f097067d

 framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml

@@ -49,6 +49,38 @@
            LVC.id = #{id} AND LVC.delete_flag = 0
    </select>

    <select id="getManagerPage" resultMap="BaseResultMap">
        SELECT
            LVC.video_id,
            LVC.comment_content,
            LVC.reply_id,
            LVC.reply_user_id,
            LVC.reply_user_nickname,
            LVC.master_comment_id,
            LVC.status,
            LVC.thumbs_up_num,
            LVC.id,
            LVC.user_id,
            LVC.user_nickname,
            LVC.user_avatar,
            LVC.create_time
        FROM
            lmk_video_comment LVC
        WHERE
         LVC.video_id = #{query.videoId} AND LVC.delete_flag = 0
        <if test="query.commentContent != null and query.commentContent !=''">
            AND LVC.comment_content like concat('%',#{query.commentContent},'%')
        </if>
        <if test="query.nickName != null and query.nickName !=''">
            AND LVC.user_nickname like concat('%',#{query.nickName},'%')
        </if>
        <if test="query.startTime != null">
            AND LVC.create_time >= #{query.startTime}
        </if>
        <if test="query.endTime != null">
            AND LVC.create_time &lt;= #{query.endTime}
        </if>
    </select>

    <select id="getPage" resultMap="BaseResultMap">
        SELECT