菜单排序

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/Menu.java

@@ -26,6 +26,8 @@ public class Menu {
     private String type;
 
     private String state;
+    @Column(name = "order_num")
+    private  Integer orderNum;
 
     private String description;
 
@@ -183,6 +185,20 @@ public class Menu {
         this.state = state;
     }
 
+    /**
+     * @return orderNum
+     */
+    public Integer getOrderNum() {
+        return orderNum;
+    }
+
+    /**
+     * @param orderNum
+     */
+    public void setOrderNum(Integer orderNum) {
+        this.orderNum = orderNum;
+    }
+
     /**
      * @return description
      */

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/PermissionService.java

@@ -23,6 +23,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -178,6 +179,9 @@ public class PermissionService {
         User user = userBiz.getUserByUsername(username);
         List<Menu> menus = menuBiz.getUserAuthorityMenuByUserId(user.getId());
         menus=menus.stream().filter(a->state.contains(a.getState()==null?"1":a.getState())).collect(Collectors.toList());
+        if (state.contains("2")){
+            menus.sort(Comparator.comparing(Menu::getOrderNum));
+        }
         return getMenuTree(menus,AdminCommonConstant.ROOT);
     }
 }

ace-modules/ace-admin/src/main/resources/mapper/MenuMapper.xml

@@ -13,6 +13,7 @@
         <result column="icon" jdbcType="VARCHAR" property="icon"/>
         <result column="type" jdbcType="CHAR" property="type"/>
         <result column="state" jdbcType="INTEGER" property="state"/>
+        <result column="order_num" jdbcType="INTEGER" property="orderNum"/>
         <result column="description" jdbcType="VARCHAR" property="description"/>
         <result column="crt_time" jdbcType="DATE" property="crtTime"/>
         <result column="crt_user" jdbcType="VARCHAR" property="crtUser"/>