finished 菜单、角色管理

src/main/java/com/qkdata/biz/sys/controller/SysMenuController.java

@@ -79,6 +79,10 @@ public class SysMenuController {
     @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<SysMenuPO> info(@PathVariable Long id){
         SysMenuPO sysMenuPO = sysMenuService.getById(id);
+        if (sysMenuPO.getParentId() != 0){
+            SysMenuPO parentMenu = sysMenuService.getById(sysMenuPO.getParentId());
+            sysMenuPO.setParentName(parentMenu.getName());
+        }
         return Result.succeed(sysMenuPO);
     }
 
@@ -103,9 +107,9 @@ public class SysMenuController {
     @GetMapping("/delete/{id}")
     @RequiresRoles(value = {BizConstants.ROLE_ADMIN,BizConstants.ROLE_OPERATOR},logical = Logical.OR)
     public Result<String> delete(@PathVariable Long id){
-        if (id <= 31){
-            throw new BusinessException("系统菜单不能删除");
-        }
+//        if (id <= 31){
+//            throw new BusinessException("系统菜单不能删除");
+//        }
         //判断是否有子菜单或按钮
         List<SysMenuPO> menuList = sysMenuService.queryListParentId(id);
         if(menuList.size() > 0){

src/main/java/com/qkdata/biz/sys/service/MenuTreeProvider.java

@@ -6,6 +6,7 @@ import com.qkdata.common.tree.IContentProvider;
 import com.qkdata.common.tree.ILabelProvider;
 import com.qkdata.common.tree.TreeTypeEnum;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -22,13 +23,14 @@ public class MenuTreeProvider implements IContentProvider, ILabelProvider {
                 children.add(sysMenuPO);
             }
         }
-        return children;
+
+        return children.stream().sorted(Comparator.comparing(SysMenuPO::getOrderNum)).collect(Collectors.toList());
     }
 
     @Override
     public List<? extends Object> getRootElement(List<?> treeData, int level, int index) {
         menuList = (List<SysMenuPO>) treeData;
-        return menuList.stream().filter(menu -> menu.getParentId() == 0).collect(Collectors.toList());
+        return menuList.stream().filter(menu -> menu.getParentId() == 0).sorted(Comparator.comparing(SysMenuPO::getOrderNum)).collect(Collectors.toList());
     }
 
     @Override

src/main/java/com/qkdata/biz/sys/service/SysMenuService.java

@@ -73,7 +73,7 @@ public class SysMenuService extends BaseServiceImpl<SysMenuMapper, SysMenuPO> {
         return userMenuList;
     }
     public List<SysMenuPO> queryListParentId(Long parentId) {
-        return list(Wrappers.<SysMenuPO>lambdaQuery().eq(SysMenuPO::getParentId,parentId));
+        return list(Wrappers.<SysMenuPO>lambdaQuery().eq(SysMenuPO::getParentId,parentId).orderByAsc(SysMenuPO::getOrderNum));
     }
 
     public List<SysMenuPO> queryNotButtonList() {