From 1e152bbcfb357073d8bcf0b51fe701e3fb81540d Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Mon, 22 Aug 2022 23:22:00 +0800
Subject: [PATCH] 修正邮箱拉取条数 添加日志上下篇

---
 snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml
index 7448b28..37d427e 100644
--- a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml
+++ b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml
@@ -33,10 +33,13 @@
         <trim prefix="WHERE" prefixOverrides="AND | OR">
             a.is_enable=1
             and a.editor_status=1
+            and a.publish_date &lt; now()
             <choose>
+                <!-- 月台查询用 -->
                 <when test="param.fileType != null">
                     and a.article_file_type = #{param.fileType}
                 </when>
+                <!-- 指定排除 视频类在首页显示,但需要在分类栏目列表显示 -->
                 <when test="param.fileType == null and param.typeId == null">
                     and a.article_file_type not in (3,4)
                 </when>
@@ -44,8 +47,10 @@
             <choose>
                 <when test="param.typeId != null">
                     AND a.article_type_id = #{param.typeId}
-                    order by a.is_top desc,a.top_value asc , a.create_date desc
+                    order by a.is_top desc,a.top_value asc , a.publish_date desc
                 </when>
+
+                <!-- 指定排除 笔记类在首页显示 -->
                 <otherwise>
                     AND a.article_type_id != 4
                     order by a.is_top desc,a.top_value asc , a.update_date desc
@@ -97,6 +102,7 @@
         		is_enable = 1
         		AND editor_status = 1
         		AND separate_year = #{separateYear}
+        		AND publish_date &lt; now()
         	)
         GROUP BY
         	separate_month
@@ -104,4 +110,13 @@
 
     </select>
 
+    <select id="getAdjoiningRecord"  resultType="vip.xiaonuo.modular.blogarticle.entity.BlogArticleVo">
+        select
+        a.id,
+        a.title
+        from
+        blog_article a
+        <include refid="queryListCondition"/>
+        limit #{param.pageNo},#{param.pageSize}
+    </select>
 </mapper>

--
Gitblit v1.9.1