添加菜单排序

authorize-api-service/src/main/java/com/xy/entity/SysMenu.java

@@ -68,7 +68,7 @@ public class SysMenu extends BaseEntity2<SysMenu> implements Serializable {
     private String route;
 
     /**
-     * 排序;倒序
+     * 排序; 正序
      */
     private Integer orders;
 

authorize-api-service/src/main/java/com/xy/redis/RedisCache.java

@@ -91,18 +91,26 @@ public class RedisCache extends AuthorizeUtils {
                         .add(SysRoleMenu::getSelectAdmin)
                 )
                 .in(SysRoleMenu::getRoleId, sysRoleIds)
-                .end();
+                .end()
+                .orderByAsc(SysMenu::getOrders);
         List<SysMenuJoinSysRoleMenu> sysMenus = sysMenuMapper.joinSelectList(sysMenuJoinLambdaWrapper, SysMenuJoinSysRoleMenu.class);
         JMap<Long, List<SysMenuJoinSysRoleMenu>> sysMenuMaps = new JArrayList<>(sysMenus).toMap(SysMenuJoinSysRoleMenu::getRoleId).group();
+        //删除redis
         roleMenuRedisService.removeMap(getKey(loginId));
+        //循环系统集合
         for (SysSystem sysSystem : sysSystems) {
             List<AuthorizeUtils.CacheEntity> cacheEntitys = new ArrayList<>();
+            //系统下角色集合
             JList<SysRole> list = new JArrayList<>(sysRoles).filter().eq(SysRole::getSysId, sysSystem.getId()).list();
+            //循环角色集合
             list.forEach(sysRole -> {
+                //获取角色菜单
+                List<SysMenuJoinSysRoleMenu> sysMenuJoinSysRoleMenus = sysMenuMaps.get(sysRole.getId());
+                //封装redis对象
                 AuthorizeUtils.CacheEntity cacheEntity = new AuthorizeUtils.CacheEntity()
                         .setRoleId(sysRole.getId())
                         .setRoleCode(sysRole.getCode())
-                        .setList(sysMenuMaps.get(sysRole.getId()));
+                        .setList(sysMenuJoinSysRoleMenus);
                 cacheEntitys.add(cacheEntity);
             });
             roleMenuRedisService.setMap(getKey(loginId), sysSystem.getId().toString(), cacheEntitys);

authorize-api/src/main/java/com/xy/dto/SysMenuDto.java

@@ -73,7 +73,7 @@ public class SysMenuDto {
         @ApiModelProperty("路由")
         private String route;
 
-        @ApiModelProperty("排序;倒序")
+        @ApiModelProperty("排序;正序")
         private Integer orders;
 
         @ApiModelProperty("图标")
@@ -106,7 +106,7 @@ public class SysMenuDto {
         @ApiModelProperty("路由")
         private String route;
 
-        @ApiModelProperty("排序;倒序")
+        @ApiModelProperty("排序;正序")
         private Integer orders;
 
         @ApiModelProperty("图标")
@@ -191,7 +191,7 @@ public class SysMenuDto {
         @ApiModelProperty("路由")
         private String route;
 
-        @ApiModelProperty("排序;倒序")
+        @ApiModelProperty("排序;正序")
         private Integer orders;
 
         @ApiModelProperty("图标")