Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPlatformMenuServiceImpl.java

@@ -49,7 +49,7 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
 
     public Long[] selectPlatformMenu(Integer tenantId){
         LambdaQueryWrapper<SysTenantMenu> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SysTenantMenu::getTenantId, tenantId);
+        queryWrapper.eq(SysTenantMenu::getTenantId, tenantId).orderByAsc(SysTenantMenu::getMenuId);
         List<SysTenantMenu> menuList = sysTenantMenuService.list(queryWrapper);
         Long[] arr = new Long[menuList.size()];
         for (int i = 0; i < menuList.size(); i++) {
@@ -60,7 +60,7 @@ public class SysPlatformMenuServiceImpl extends AbstractCrudService<SysPlatformM
 
     public Long[] selectMobilePlatformMenu(Integer tenantId){
         LambdaQueryWrapper<SysMobileTenantMenu> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(SysMobileTenantMenu::getTenantId, tenantId);
+        queryWrapper.eq(SysMobileTenantMenu::getTenantId, tenantId).orderByAsc(SysMobileTenantMenu::getMenuId);
         List<SysMobileTenantMenu> menuList = sysMobileTenantMenuService.list(queryWrapper);
         Long[] arr = new Long[menuList.size()];
         for (int i = 0; i < menuList.size(); i++) {

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysPlatformMenuMapper.xml

@@ -19,6 +19,7 @@
         <if test="menuType != null and menuType != ''">
             AND a.menu_type = #{menuType}
         </if>
+        order by a.parent_id, a.order_num
     </select>
 
     <select id="getMobileMenuList"  resultType="com.usky.system.domain.SysMobileMenu" >
@@ -32,6 +33,7 @@
         <if test="menuType != null and menuType != ''">
             AND a.menu_type = #{menuType}
         </if>
+        order by a.parent_id, a.order_num
     </select>
 
     <select id="getMenuIdList" resultType="com.usky.system.domain.SysMenu">