diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java index e5f7f539d..563dcf7ff 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.controller; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.service.SysMenuService; import com.pig4cloud.pigx.common.core.util.R; @@ -27,6 +28,7 @@ import com.pig4cloud.pigx.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -81,19 +83,20 @@ public class SysMenuController { */ @GetMapping("/tree/{roleId}") public R getRoleTree(@PathVariable Long roleId) { - return R.ok( - sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList())); + return R + .ok(sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList())); } - /** - * 通过ID查询菜单的详细信息 - * @param id 菜单ID - * @return 菜单详细信息 - */ - @GetMapping("/{id}") - public R getById(@PathVariable Long id) { - return R.ok(sysMenuService.getById(id)); - } + /** + * 通过ID查询菜单的详细信息 + * + * @param query 菜单ID + * @return 菜单详细信息 + */ + @GetMapping("/details") + public R getById(@ParameterObject SysMenu query) { + return R.ok(sysMenuService.getOne(Wrappers.query(query), false)); + } /** * 新增菜单