From 3f5dcc2b5bc8d2e922b23910f0f00639a3f0c2da Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 07 Aug 2022 14:59:12 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/ArticleMapper.xml |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 305c3df..02ee778 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -5,10 +5,13 @@
     <select id="selectAdminArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.AdminArticleVo">
         SELECT
         a.*,
-        b.column_name columnName
+        b.column_name columnName,
+        c.web_address baseUrl,
+        b.path path
         FROM
         t_article a
         left join t_column b on a.column_id = b.id
+        inner join t_company c on a.company_id=c.id
         <where>
             and a.del_status = 1
             <if test="record != null" >
@@ -45,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>
@@ -73,7 +79,7 @@
         inner join t_column b on a.column_id=b.id
         inner join t_column c on b.parent_id=c.id or c.id=b.id
         <where>
-            a.company_id=#{record.companyId}
+            a.company_id=#{record.companyId} and a.del_status = 1 and release_status = 1
             <if test="record.columnCode != null and record.columnCode != ''">
                 and c.column_code=#{record.columnCode}
             </if>
@@ -83,23 +89,28 @@
                     ${item}
                 </foreach>
             </if>
+            <if test="record.isTop != null and record.isTop != ''">
+                and a.is_top=#{record.isTop}
+            </if>
         </where>
+        order by release_time desc
     </select>
 
     <select id="selectWebArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.WebArticleVo">
         SELECT
         a.*,
-        b.column_name columnName
+        b.column_name columnName,
+        c.web_address baseUrl,
+        b.path path
         FROM
         t_article a
         left join t_column b on a.column_id = b.id
+        inner join t_company c on a.company_id=c.id
         <where>
             and a.del_status = 1
             and a.release_status = 1
+            and a.company_id = #{record.companyId}
             <if test="record != null" >
-                <if test="record.companyId != null">
-                    and a.company_id = #{record.companyId}
-                </if>
                 <if test="record.columnId != null">
                     and a.column_id = #{record.columnId}
                 </if>
@@ -118,8 +129,21 @@
     </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} and a.del_status = 1
+        <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}
+        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