From a88bc9d86256d94dcb4580d43bd88b3f19e98c15 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 16:06:38 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/ArticleMapper.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index b4f4930..63fedc5 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -48,14 +48,17 @@
     <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}
+        where (a.column_id=b.id or a.column_id=b.parent_id) and a.column_id=#{columnId} and release_status=1
+        and del_status = 1
         <!--上一篇-->
         <if test="type == 1">
-            order by a.id
+            and #{id} > a.id
+            order by a.id desc
         </if>
         <!--下一篇-->
         <if test="type == 2">
-            order by a.id desc
+            and a.id > #{id}
+            order by a.id
         </if>
         limit 1
     </select>
@@ -85,6 +88,9 @@
                 <foreach collection="record.columnIds" item="item" open="(" close=")" separator=",">
                     ${item}
                 </foreach>
+            </if>
+            <if test="record.releaseType == 2">
+                and release_status = 1
             </if>
         </where>
         order by release_time desc
@@ -121,7 +127,7 @@
 
     <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
         select a.id from t_article a
-        where a.column_id=#{columnId} and a.company_id=#{companyId}
+        where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1
         <if test="type != 4">
             <if test="type == 2">
                 and release_status=1
@@ -134,7 +140,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}
+        where a.column_id=#{columnId} and a.company_id=#{companyId} and a.del_status = 1
         <if test="type != 4">
             <if test="type == 2">
                 and release_status=1

--
Gitblit v1.9.1