From fc74b40b05413d2fbf5667c129e23245d54ae6a8 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Fri, 12 Aug 2022 18:53:29 +0800
Subject: [PATCH] 系统配置更换

---
 snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 789dba3..7448b28 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
@@ -24,6 +24,7 @@
        a.is_top,
        a.editor_status,
        a.is_allowed_comment,
+       a.jump_url as jumpURL,
        a.update_date,
        a.create_date
     </sql>
@@ -32,7 +33,14 @@
         <trim prefix="WHERE" prefixOverrides="AND | OR">
             a.is_enable=1
             and a.editor_status=1
-
+            <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>
+            </choose>
             <choose>
                 <when test="param.typeId != null">
                     AND a.article_type_id = #{param.typeId}
@@ -50,7 +58,7 @@
     <select id="searchList" resultType="vip.xiaonuo.modular.blogarticle.entity.BlogArticleVo">
         select
         <include refid="Base_Column_List"/>
-        ,IFNULL("",CONCAT("/",f2.file_bucket,"/",f2.file_object_name)) as coverFileURL
+        ,IF(a.cover_file_id is not null,CONCAT("/",f2.file_bucket,"/",f2.file_object_name),"") as coverFileURL
         ,t.type_name as articleTypeName
         from
         blog_article a
@@ -81,7 +89,7 @@
     <select id="searchMonthCount" resultType="vip.xiaonuo.modular.blogStatistics.vo.BlogArchiveDetailVo">
        SELECT
 	    separate_month AS `month`,
-	    count(1) AS count
+	    count(1) AS `count`
         FROM
         	blog_article
         WHERE

--
Gitblit v1.9.1