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 8fe6f5386..0545aadbd 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 @@ -10,6 +10,7 @@ import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; /** * 系统菜单参数 @@ -75,7 +76,7 @@ public class SysMenuRequest extends BaseRequest { * 排序 */ @NotNull(message = "排序不能为空", groups = {add.class, edit.class}) - private Integer menuSort; + private BigDecimal menuSort; /** * 图标 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 e9e7ccda5..3978c684a 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 @@ -142,6 +142,12 @@ public class SysMenu extends BaseEntity implements AbstractTreeNode { @TableField(exist = false) private String appName; + /** + * 父级菜单的名称 + */ + @TableField(exist = false) + private String menuParentName; + @Override public String getNodeId() { return menuId.toString(); 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 10397bd50..d572571e0 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 @@ -142,7 +142,25 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public SysMenu detail(SysMenuRequest sysMenuRequest) { - return this.querySysMenu(sysMenuRequest); + SysMenu sysMenu = this.querySysMenu(sysMenuRequest); + + // 设置父级菜单名称 + if (sysMenu != null) { + Long menuParentId = sysMenu.getMenuParentId(); + if (SystemConstants.DEFAULT_PARENT_ID.equals(menuParentId)) { + sysMenu.setMenuParentName("顶级"); + } else { + Long parentId = sysMenu.getMenuParentId(); + SysMenu parentMenu = this.getById(parentId); + if (parentMenu == null) { + sysMenu.setMenuParentName("无"); + } else { + sysMenu.setMenuParentName(parentMenu.getMenuName()); + } + } + } + + return sysMenu; } @Override