From be8945a88481c900e2f9cc6be0f3983768f1da6a Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Fri, 29 Mar 2024 18:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E6=96=87=E7=AB=A0=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java    | 4 ++--
 .../java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java    | 4 ++--
 .../com/gxwebsoft/oa/service/impl/CompanyServiceImpl.java     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
index fe3bf33..0b8b7aa 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
@@ -23,7 +23,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
     @Override
     public PageResult<Article> pageRel(ArticleParam param) {
         PageParam<Article, ArticleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc, create_time desc");
         List<Article> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
         List<Article> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<Article, ArticleParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc, create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java
index 77a9e3e..a82c000 100644
--- a/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/oa/service/impl/AppServiceImpl.java
@@ -23,7 +23,7 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements AppSe
     @Override
     public PageResult<App> pageRel(AppParam param) {
         PageParam<App, AppParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc, create_time desc");
         List<App> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements AppSe
         List<App> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<App, AppParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc, create_time desc");
         return page.sortRecords(list);
     }
 
diff --git a/src/main/java/com/gxwebsoft/oa/service/impl/CompanyServiceImpl.java b/src/main/java/com/gxwebsoft/oa/service/impl/CompanyServiceImpl.java
index 3ea1c0e..a268fc9 100644
--- a/src/main/java/com/gxwebsoft/oa/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/oa/service/impl/CompanyServiceImpl.java
@@ -23,7 +23,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     @Override
     public PageResult<Company> pageRel(CompanyParam param) {
         PageParam<Company, CompanyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc, create_time desc");
         List<Company> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         List<Company> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<Company, CompanyParam> page = new PageParam<>();
-        //page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sort_number asc, create_time desc");
         return page.sortRecords(list);
     }