diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java index 8973c7267..8fe6f5386 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java @@ -109,6 +109,16 @@ public class SysMenuRequest extends BaseRequest { */ private String remark; + /** + * 菜单的路径,适用于layui-beetl版本 + */ + private String layuiPath; + + /** + * 菜单的图标,适用于layui-beetl版本 + */ + private String layuiIcon; + /** * 获取主页左侧菜单列表(适配Antd Vue的版本) */ diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java index f4a1457f9..b566d3383 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java @@ -1,5 +1,7 @@ package cn.stylefeng.roses.kernel.system.pojo.ztree; +import cn.stylefeng.roses.kernel.system.constants.SystemConstants; + /** * jquery ztree 插件的节点封装 * @@ -47,10 +49,10 @@ public class ZTreeNode { public static ZTreeNode createParent() { ZTreeNode zTreeNode = new ZTreeNode(); zTreeNode.setChecked(true); - zTreeNode.setId(0L); + zTreeNode.setId(SystemConstants.DEFAULT_PARENT_ID); zTreeNode.setName("顶级"); zTreeNode.setOpen(true); - zTreeNode.setpId(0L); + zTreeNode.setpId(SystemConstants.VIRTUAL_ROOT_PARENT_ID); return zTreeNode; } 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 0425571e2..3fcea7678 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 @@ -185,6 +185,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl zTreeNodes.add(zTreeNode); } + // 创建顶级节点 + zTreeNodes.add(ZTreeNode.createParent()); + return zTreeNodes; }