From 70097d968795fcc872095c42f7b7bba618baaaf9 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Tue, 02 Aug 2022 17:34:56 +0800
Subject: [PATCH] 外链跳转

---
 snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 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 1615954..2f17529 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
@@ -23,6 +23,9 @@
        a.publish_date,
        a.is_top,
        a.editor_status,
+       a.is_allowed_comment,
+       a.jump_url as jumpURL,
+       a.update_date,
        a.create_date
     </sql>
 
@@ -30,17 +33,25 @@
         <trim prefix="WHERE" prefixOverrides="AND | OR">
             a.is_enable=1
             and a.editor_status=1
-            <if test="param.typeId != null">
-                AND a.article_type_id = #{param.typeId}
-            </if>
+
+            <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
+                </when>
+                <otherwise>
+                    AND a.article_type_id != 4
+                    order by a.is_top desc,a.top_value asc , a.update_date desc
+                </otherwise>
+            </choose>
         </trim>
+
     </sql>
 
-    <select id="searchList" resultType="vip.xiaonuo.modular.blogarticle.param.BlogArticleVo">
+    <select id="searchList" resultType="vip.xiaonuo.modular.blogarticle.entity.BlogArticleVo">
         select
         <include refid="Base_Column_List"/>
-        ,CONCAT("/",f1.file_bucket,"/",f1.file_object_name) as articleFileURL
-        ,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
@@ -55,8 +66,6 @@
         on f2.id=a.cover_file_id
 
         <include refid="queryListCondition"/>
-
-        order by a.top_value asc , a.create_date desc
 
         limit #{param.pageNo},#{param.pageSize}
     </select>

--
Gitblit v1.9.1