From 9035f78fbcd60c452b5e37e5687813c35e9c4ff2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 10:21:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ArticleMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index ef9352b..acc3a78 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -15,15 +15,15 @@
<if test="record.columnId != null">
and a.column_id = #{record.columnId}
</if>
- <if test="record.belongId != null">
- and a.company_id = #{record.belongId}
+ <if test="record.companyId != null">
+ and a.company_id = #{record.companyId}
</if>
<if test="record.title!=null">
and a.title like concat ('%',#{record.title},'%')
</if>
</if>
</where>
- order by a.create_time desc
+ order by a.is_top desc,a.create_time desc
</select>
<select id="selectAdminArticleByid" resultType="com.xcong.farmer.cms.modules.system.vo.AdminSeeArticleInfoVo">
@@ -33,4 +33,24 @@
t_article a where id = #{id}
</select>
+ <select id="selectPrevOrNextArticle" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
+ select *
+ from t_article a, t_column b
+ where a.id!=#{id} and (a.column_id=b.id or a.column_id=b.parent_id) and a.column_id=#{columnId}
+ <!--上一篇-->
+ <if test="type == 1">
+ order by a.id
+ </if>
+ <!--下一篇-->
+ <if test="type == 2">
+ order by a.id desc
+ </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>
\ No newline at end of file
--
Gitblit v1.9.1