From 82cf0010e8c7eb51bd120aadea108ff6ba5821b2 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 17 Aug 2023 17:17:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/system/controller/menu/SysMenuController.java | 4 ++++
 .../org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml   | 1 +
 .../org/nl/system/service/menu/impl/SysMenuServiceImpl.java   | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java
index 71e5679..987d3e6 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java
@@ -3,6 +3,7 @@ package org.nl.system.controller.menu;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 
@@ -76,6 +77,9 @@ public class SysMenuController {
     @ApiOperation("查询菜单")
     @SaCheckPermission("menu:list")
     public ResponseEntity<Object> pageQuery(MenuQuery query, PageQuery page) throws Exception {
+        if (ObjectUtil.isEmpty(page.getSort())) {
+            page.setSort("menu_sort,asc");
+        }
         List list = iSysMenuService.query(query, page);
         return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
index 7787999..f3aef2b 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
@@ -68,6 +68,7 @@
         WHERE
         role_id IN ( SELECT role_id FROM sys_users_roles  where user_id = #{user})
         )
+        ORDER BY menu_sort
     </select>
     <select id="getMenusByRole" resultType="java.util.Map">
         SELECT
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
index d29e0d6..7146a88 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
@@ -344,7 +344,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         } else {
             queryWrapper = new QueryWrapper<SysMenu>().isNull("pid");
         }
-        return baseMapper.selectList(queryWrapper);
+        return baseMapper.selectList(queryWrapper.orderByAsc("menu_sort"));
     }
 
     @Override