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

Helius

2022-07-07 f04b8922283120e2bc4a476ddc302ebd3b0894e4

 src/main/resources/mapper/ArticleMapper.xml

@@ -12,9 +12,9 @@
        <where>
            and a.del_status = 1
            <if test="record != null" >
                <if test="record.columnlist != null">
                <if test="record.columnList != null">
                    and a.column_id in
                    <foreach collection="record.columnlist" separator="," close=")" open="(" item="item">
                    <foreach collection="record.columnList" separator="," close=")" open="(" item="item">
                        #{item}
                    </foreach>
                </if>
@@ -116,4 +116,17 @@
        </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>