表结构维护

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/menu/MenuService.java

@@ -114,7 +114,7 @@ public class MenuService extends BaseService<MenuMapper, Menu> implements IMenuS
     @Override
     public List<Tree<String>> getRouters() {
         String userId = LoginHelper.getUserId();
-        QueryWrapper queryWrapper = QueryWrapper.create().orderBy(Menu::getOrderNum).asc();
+        QueryWrapper queryWrapper = QueryWrapper.create();
         List<TreeNode<String>> treeNodeList = buildMenuTreeNodes(userId, queryWrapper);
         return TreeUtil.build(treeNodeList, "0");
 
@@ -123,14 +123,14 @@ public class MenuService extends BaseService<MenuMapper, Menu> implements IMenuS
     private List<TreeNode<String>> buildMenuTreeNodes(String userId, QueryWrapper queryWrapper) {
         List<MenuVO> menuVOList;
         if (LoginHelper.isSuperAdmin(userId)) {
-            menuVOList = menuMapper.selectListWithRelationsByQueryAs(queryWrapper,
+            menuVOList = menuMapper.selectListWithRelationsByQueryAs(queryWrapper.orderBy(Menu::getOrderNum).asc(),
                     MenuVO.class);
         } else {
             queryWrapper.select(QueryMethods.distinct(ROLE_MENU.MENU_ID))
                     .from(USER_ROLE.as("urt"))
                     .leftJoin(ROLE_MENU.as("rmt")).on(USER_ROLE.ROLE_ID.eq(ROLE_MENU.ROLE_ID))
                     .where(USER_ROLE.USER_ID.eq(userId));
-            List<String> menuIds = roleMenuMapper.selectListWithRelationsByQueryAs(queryWrapper, String.class);
+            List<String> menuIds = roleMenuMapper.selectListByQueryAs(queryWrapper, String.class);
             menuVOList = menuMapper.selectListWithRelationsByQueryAs(QueryWrapper.create().in(Menu::getMenuId, menuIds).orderBy(Menu::getOrderNum).asc(), MenuVO.class);
         }
         List<JSONObject> resultJsonObjectList = menuVOList.stream().map(menuVO -> {

eco-start/src/main/resources/db/mysql/V1_0_0_1__sys-init-ddl.sql

@@ -174,20 +174,6 @@ CREATE TABLE `system_permission_t`
     PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限点' ROW_FORMAT = DYNAMIC;
 
--- ----------------------------
--- Records of system_permission_t
--- ----------------------------
-INSERT INTO `system_permission_t`
-VALUES ('71723107285000103', '客户端', 'system:client:page');
-INSERT INTO `system_permission_t`
-VALUES ('71723107289000127', 'menu', 'system:menu:delete');
-INSERT INTO `system_permission_t`
-VALUES ('71723107290000120', 'org', 'system:org:add');
-INSERT INTO `system_permission_t`
-VALUES ('71723107290010171', 'org', 'system:org:delete');
-INSERT INTO `system_permission_t`
-VALUES ('71723107290020171', 'position', 'system:position:add');
-
 -- ----------------------------
 -- Table structure for system_position_t
 -- ----------------------------
@@ -218,10 +204,10 @@ CREATE TABLE `system_position_t`
 DROP TABLE IF EXISTS `system_role_menu_t`;
 CREATE TABLE `system_role_menu_t`
 (
-    `role_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色ID',
-    `menu_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '菜单ID',
+    `role_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID',
+    `menu_id` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '菜单ID',
     PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '角色菜单' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色菜单' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for system_role_perm_t