From bff5083b028f91d5a060ee7c193369029eef5125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 19 Jul 2026 12:13:16 +0800
Subject: [PATCH] =?UTF-8?q?fix(cms):=20=E4=BC=98=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在CmsArticleMapper.xml的分页和查询全部SQL语句中添加排序条件
- 按推荐度降序、排序号升序、创建时间降序排序文章列表
- 移除CmsArticleServiceImpl中重复的默认排序设置逻辑
---
 src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml | 2 ++
 .../com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml
index d46baf8..b9ce6c3 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsArticleMapper.xml
@@ -152,11 +152,13 @@
     <!-- 分页查询 -->
     <select id="selectPageRel" resultType="com.gxwebsoft.cms.entity.CmsArticle">
         <include refid="selectSql"></include>
+        ORDER BY a.recommend DESC, a.sort_number ASC, a.create_time DESC
     </select>
 
     <!-- 查询全部 -->
     <select id="selectListRel" resultType="com.gxwebsoft.cms.entity.CmsArticle">
         <include refid="selectSql"></include>
+        ORDER BY a.recommend DESC, a.sort_number ASC, a.create_time DESC
     </select>
 
     <select id="selectListAllRel" resultType="com.gxwebsoft.cms.entity.CmsArticle">
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java
index db36f0a..9cbe74b 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java
@@ -65,7 +65,6 @@ public class CmsArticleServiceImpl extends ServiceImpl<CmsArticleMapper, CmsArti
       }
     }
     PageParam<CmsArticle, CmsArticleParam> page = new PageParam<>(param);
-    page.setDefaultOrder("sort_number asc,create_time desc");
     List<CmsArticle> list = baseMapper.selectPageRel(page, param);
 
     return new PageResult<>(list, page.getTotal());