From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/resources/mapper/ArticleMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index eedc185..0def852 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -68,12 +68,12 @@
<!--上一篇-->
<if test="type == 1">
and #{id} > a.id
- order by a.id desc
+ order by a.release_time
</if>
<!--下一篇-->
<if test="type == 2">
and a.id > #{id}
- order by a.id
+ order by a.release_time desc
</if>
limit 1
</select>
@@ -158,7 +158,7 @@
<select id="selectArticleByColumnId" resultType="com.xcong.farmer.cms.modules.system.entity.ArticleEntity">
select * from t_article a
- where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1
+ where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1 and draft_state=2
<if test="type != 4">
<if test="type == 2">
and release_status=1
--
Gitblit v1.9.1