From 6bd7bd33a9154a7d175f172073e6a5ee8b0174c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Wed, 21 Aug 2024 22:38:39 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java
---
 .../admin/controller/SysAreaController.java   |  6 +++---
 .../admin/controller/SysMenuController.java   | 21 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java
index 00bb99226..2fefc890b 100644
--- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java
+++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java
@@ -64,12 +64,12 @@ public class SysAreaController {
 
 
     /**
-     * 通过id查询行政区划
+     * 获取详细信息
      *
      * @param sysArea 查询条件
-     * @return R
+     * @return {@link R }
      */
-    @Operation(summary = "通过id查询", description = "通过id查询")
+    @Operation(summary = "获取详细信息", description = "获取详细信息")
     @GetMapping("/details")
     @PreAuthorize("@pms.hasPermission('sys_sysArea_view')")
     public R getDetails(@ParameterObject SysAreaEntity sysArea) {
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 563dcf7ff..87925bab2 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
@@ -87,16 +87,17 @@ public class SysMenuController {
 			.ok(sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList()));
 	}
 
-    /**
-     * 通过ID查询菜单的详细信息
-     *
-     * @param query 菜单ID
-     * @return 菜单详细信息
-     */
-    @GetMapping("/details")
-    public R getById(@ParameterObject SysMenu query) {
-        return R.ok(sysMenuService.getOne(Wrappers.query(query), false));
-    }
+	/**
+	 * 获取详细信息
+	 *
+	 * @param query 查询条件
+	 * @return {@link R }
+	 */
+	@GetMapping("/details")
+	public R getDetails(@ParameterObject SysMenu query) {
+		return R.ok(sysMenuService.list(Wrappers.query(query)));
+	}
+
 
 	/**
 	 * 新增菜单