fix: 菜单排序问题

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);
     }

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

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