From fef03417a1f77e9d34629f579d82a68ca45c7e77 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jun 2022 16:02:03 +0800
Subject: [PATCH] 20220606

---
 src/main/resources/mapper/NavigationBarMapper.xml |    3 ++-
 src/main/resources/mapper/ColumnMapper.xml        |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index 3ea4d55..eb425ab 100644
--- a/src/main/resources/mapper/ColumnMapper.xml
+++ b/src/main/resources/mapper/ColumnMapper.xml
@@ -26,7 +26,7 @@
         FROM
         t_column a
         where a.parent_id = #{parentId} and a.company_id = #{belongId}
-        order by a.create_time desc
+        order by a.order_num ASC,a.create_time desc
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/NavigationBarMapper.xml b/src/main/resources/mapper/NavigationBarMapper.xml
index 0aef3ca..65bda7f 100644
--- a/src/main/resources/mapper/NavigationBarMapper.xml
+++ b/src/main/resources/mapper/NavigationBarMapper.xml
@@ -27,7 +27,8 @@
         t_navigation_bar a
         where a.parent_id = #{parentId}
           and a.company_id = #{belongId}
-        order by a.create_time desc
+
+        order by a.order_num ASC, a.create_time desc
     </select>
 
     <select id="selectListByParentId" resultType="com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity">

--
Gitblit v1.9.1