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

xiaoyong931011

2022-07-05 e703d415ff36584518a76d4d26363bfd1556b43b

 src/main/resources/mapper/ArticleMapper.xml

@@ -21,6 +21,11 @@
                <if test="record.title!=null">
                    and a.title like concat ('%',#{record.title},'%')
                </if>
                <if test="record.columnIds != null">
                    <foreach collection="record.columnIds" separator="," close=")" open="(" item="item">
                        #{item}
                    </foreach>
                </if>
            </if>
        </where>
        order by a.is_top desc,a.create_time desc
@@ -47,4 +52,10 @@
        </if>
        limit 1
    </select>

    <select id="selectArticleById" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
        select a.*, b.column_code, b.column_name
        from t_article a, t_column b
        where a.column_id=b.id and a.id=#{id}
    </select>
</mapper>