菜单管理增加排序

ebike-staff/src/main/java/com/cdzy/staff/controller/EbikePermissionController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Objects;
 
+import static com.cdzy.staff.model.entity.table.EbikePermissionTableDef.EBIKE_PERMISSION;
+
 /**
  * 系统权限表 控制层。
  *
@@ -98,7 +100,8 @@ public class EbikePermissionController {
      */
     @GetMapping("page")
     public JsonResult<?> page(PageParam pageParam,String name) {
-        QueryWrapper queryWrapper = QueryWrapper.create().like(EbikePermission::getName,name, StringUtil.hasText(name));
+        QueryWrapper queryWrapper = QueryWrapper.create().like(EbikePermission::getName,name, StringUtil.hasText(name))
+                .orderBy(EBIKE_PERMISSION.SORT,true);
         Page<EbikePermission> page = ebikePermissionService.page(pageParam.getPage(),queryWrapper);
         return JsonResult.success(page);
     }

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikePermission.java

@@ -46,6 +46,8 @@ public class EbikePermission implements Serializable {
      */
     private Integer type;
 
+    private Integer sort;
+
     private Long createBy;
 
     @Column(onInsertValue = "now()")

ebike-staff/src/main/java/com/cdzy/staff/model/vo/EbikePermissionVo.java

@@ -41,6 +41,9 @@ public class EbikePermissionVo implements Serializable {
     @NotNull(message = "类型不能为空")
     private Integer type;
 
+
+    private Integer sort;
+
     /**
      * 组件路径
      */

ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikePermissionServiceImpl.java

@@ -77,7 +77,8 @@ public class EbikePermissionServiceImpl extends ServiceImpl<EbikePermissionMappe
     public List<EbikePermissionTreeNode> tree() {
         boolean sysAdmin = checkSysAdmin();
         QueryWrapper queryWrapper = QueryWrapper.create()
-                .isNull(EbikePermission::getParentId);
+                .isNull(EbikePermission::getParentId)
+                .orderBy(EBIKE_PERMISSION.SORT,true);
         if (!sysAdmin) {
             Long loginId = StpUtil.getLoginIdAsLong();
             queryWrapper
@@ -89,9 +90,11 @@ public class EbikePermissionServiceImpl extends ServiceImpl<EbikePermissionMappe
         List<Long> firstIds = first.stream().map(EbikePermissionTreeNode::getPermissionId).toList();
         List<EbikePermissionTreeNode> second = null;
         List<EbikePermissionTreeNode> third = null;
+
         if (!firstIds.isEmpty()) {
             queryWrapper.clear();
-            queryWrapper.in(EbikePermission::getParentId, firstIds);
+            queryWrapper.in(EbikePermission::getParentId, firstIds)
+                    .orderBy(EBIKE_PERMISSION.SORT, true);
             if (!sysAdmin) {
                 Long loginId = StpUtil.getLoginIdAsLong();
                 queryWrapper
@@ -103,7 +106,8 @@ public class EbikePermissionServiceImpl extends ServiceImpl<EbikePermissionMappe
             List<Long> secondIds = second.stream().map(EbikePermissionTreeNode::getPermissionId).toList();
             if (!secondIds.isEmpty()) {
                 queryWrapper.clear();
-                queryWrapper.in(EbikePermission::getParentId, secondIds);
+                queryWrapper.in(EbikePermission::getParentId, secondIds)
+                        .orderBy(EBIKE_PERMISSION.SORT,true);
                 if (!sysAdmin) {
                     Long loginId = StpUtil.getLoginIdAsLong();
                     queryWrapper