Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-08 e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf

 src/main/resources/mapper/ArticleMapper.xml

@@ -12,8 +12,11 @@
        <where>
            and a.del_status = 1
            <if test="record != null" >
                <if test="record.columnId != null">
                    and a.column_id = #{record.columnId}
                <if test="record.columnList != null">
                    and a.column_id in
                    <foreach collection="record.columnList" separator="," close=")" open="(" item="item">
                        #{item}
                    </foreach>
                </if>
                <if test="record.companyId != null">
                    and a.company_id = #{record.companyId}
@@ -82,4 +85,46 @@
            </if>
        </where>
    </select>

    <select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
        SELECT
        a.*,
        b.column_name columnName
        FROM
        t_article a
        left join t_column b on a.column_id = b.id
        <where>
            and a.del_status = 1
            and a.release_status = 1
            and a.company_id = #{record.companyId}
            <if test="record != null" >
                <if test="record.columnId != null">
                    and a.column_id = #{record.columnId}
                </if>
                <if test="record.title!=null">
                    and a.title like concat ('%',#{record.title},'%')
                </if>
                <if test="record.author!=null">
                    and a.author like concat ('%',#{record.author},'%')
                </if>
                <if test="record.timeType!=null">
                    and a.release_time > #{record.timeType}
                </if>
            </if>
        </where>
        order by a.is_top desc,a.create_time desc
    </select>

    <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
        select * from t_article a
        where a.column_id=#{columnId} and a.company_id=#{companyId}
        <if test="type != 4">
            <if test="type == 2">
                and release_status=1
            </if>
            <if test="type == 3">
                and release_status=0
            </if>
        </if>
    </select>
</mapper>