调整菜单顺序

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -192,6 +192,8 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
             }
             authMenuIdList = authorizeList.stream().map(Authorize::getObjectId).collect(Collectors.toList());
         }
+        List<String> orderList = new ArrayList<>();
+        orderList.add("t1.sort_code");orderList.add("t.sort_code");
         List<MenuVo> menuVos = this.selectJoinList(MenuVo.class,
             MPJWrappers.<Menu>lambdaJoin()
             .like(StrUtil.isNotBlank(dto.getTitle()), Menu::getTitle, dto.getTitle())
@@ -206,7 +208,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
             .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
             .leftJoin(Subsystem.class, Subsystem::getId, Menu::getSystemId)
             .eq(Menu::getEnabledMark, EnabledMark.ENABLED.getCode())
-            .orderByAsc(Menu::getSortCode)
+            .orderByAscStr(orderList)
         );
         List<XjrMentDeptGroupVo> menuDept = menuDeptRelationMapper.getMenuDept();
         Map<Long, String> deptNameMap = new HashMap<>();