diff --git a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java index 667010a..105824b 100644 --- a/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java +++ b/upms/upms-api/src/main/java/com/rax/admin/api/entity/SysMenu.java @@ -58,6 +58,10 @@ public class SysMenu extends Model { @Schema(description = "菜单父id") private Long parentId; + @NotNull(message = "菜单父名称不能为空") + @Schema(description = "菜单父") + private String parentName; + /** * 图标 */ diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java index b048b48..250b864 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java @@ -40,6 +40,8 @@ public class SysLogServiceImpl extends ServiceImpl impleme .le(SysLog::getCreateTime, sysLog.getCreateTime()[1]); } + wrapper.orderByDesc(SysLog::getCreateTime); + return baseMapper.selectPage(page, wrapper); } diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java index b7b535d..e304479 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysMenuServiceImpl.java @@ -142,6 +142,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl extra.put("menuType", menu.getMenuType()); extra.put("permission", menu.getPermission()); extra.put("sortOrder", menu.getSortOrder()); + extra.put("visible", menu.getVisible()); + extra.put("parentName", menu.getParentName()); // 适配 vue3 Map meta = new HashMap<>();