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

xiaoyong931011

2022-07-07 50a170ab1b38e97063e7a32da51e07b939638e8d

 src/main/resources/mapper/ArticleMapper.xml

@@ -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>