diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java index d04d95f21..0ec7cc511 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java @@ -73,6 +73,17 @@ public class SysMenuController { return new SuccessResponseData(sysMenuService.detail(sysMenuRequest)); } + /** + * 获取菜单列表(layui版本) + * + * @author fengshuonan + * @date 2021/1/6 17:09 + */ + @GetResource(name = "获取菜单列表(layui版本)", path = "/sysMenu/layuiList") + public ResponseData layuiList(SysMenuRequest sysMenuRequest) { + return new SuccessResponseData(sysMenuService.layuiList(sysMenuRequest)); + } + /** * 系统菜单列表,树形结构,用于菜单管理界面的列表展示 * diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java index 835d078f1..6dd206308 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenu.java @@ -29,7 +29,7 @@ public class SysMenu extends BaseEntity implements AbstractTreeNode { private Long menuId; /** - * 父id,顶级节点的父id是0 + * 父id,顶级节点的父id是-1 */ @TableField("menu_parent_id") private Long menuParentId; @@ -150,5 +150,5 @@ public class SysMenu extends BaseEntity implements AbstractTreeNode { public void setChildrenNodes(List childrenNodes) { this.children = childrenNodes; } - + } diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java index 780c74254..cf848c883 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java @@ -78,6 +78,14 @@ public interface SysMenuService extends IService { */ SysMenu detail(SysMenuRequest sysMenuRequest); + /** + * 获取菜单列表(layui版本) + * + * @author fengshuonan + * @date 2021/1/6 17:10 + */ + List layuiList(SysMenuRequest sysMenuRequest); + /** * 系统菜单列表,树形结构,用于菜单管理界面的列表展示 * diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java index 6eddcfea0..b84104a21 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java @@ -124,7 +124,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 获取所有子级的节点id Set childIdList = this.dbOperatorApi.findSubListByParentId( - "sys_menu", "pids", "id", id); + "sys_menu", "menu_pids", "menu_id", id); childIdList.add(id); // 逻辑删除,设置删除标识 @@ -140,6 +140,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl return this.querySysMenu(sysMenuRequest); } + @Override + public List layuiList(SysMenuRequest sysMenuRequest) { + + LambdaQueryWrapper wrapper = createWrapper(sysMenuRequest); + + return this.list(wrapper); + } + @Override public List list(SysMenuRequest sysMenuRequest) { @@ -313,6 +321,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl queryWrapper.eq(SysMenu::getDelFlag, YesOrNotEnum.N.getCode()); // 根据排序升序排列,序号越小越在前 + queryWrapper.orderByAsc(SysMenu::getAppCode); queryWrapper.orderByAsc(SysMenu::getMenuSort); return queryWrapper;