From 9b7e2fc3c8b0c060ca56b86586e9c5d58d4a7a34 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 15:11:35 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/ArticleMapper.xml |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index efb31cb..c8c0357 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -48,7 +48,7 @@
     <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.id!=#{id} and (a.column_id=b.id or a.column_id=b.parent_id) and a.column_id=#{columnId} and release_status=1
         <!--上一篇-->
         <if test="type == 1">
             order by a.id
@@ -86,7 +86,11 @@
                     ${item}
                 </foreach>
             </if>
+            <if test="record.releaseType == 2">
+                and release_status = 1
+            </if>
         </where>
+        order by release_time desc
     </select>
 
     <select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
@@ -119,6 +123,19 @@
     </select>
 
     <select id="selectArticleIdsByColumnId" resultType="java.lang.Long">
+        select a.id 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>
+
+    <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}
         <if test="type != 4">

--
Gitblit v1.9.1