From 6ffb8ca63b91453302793c143e428eb109822e0e Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Mon, 3 Jul 2023 15:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/role.go | 32 --------------------------------
 api/controller/user.go | 32 ++++++++++++++++++++++++++++++++
 api/router/router.go   |  6 +++---
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/api/controller/role.go b/api/controller/role.go
index 4f5dc5d..61a43b8 100644
--- a/api/controller/role.go
+++ b/api/controller/role.go
@@ -14,38 +14,6 @@ import (
 
 type Role struct{}
 
-// GetRoleMenuList 获取登陆角色菜单列表
-func (r *Role) GetRoleMenuList(c *gin.Context) {
-	roleId := c.GetInt64("RoleId")
-	if roleId == 0 {
-		responses.Fail(c)
-		return
-	}
-
-	roleService := service.RoleService{}
-
-	// 获取角色身份
-	isAdmin, err := roleService.GetRoleIden(c)
-	if err != nil {
-		responses.FailWithMessage(err.Error(), c)
-		return
-	}
-
-	// 获取角色菜单
-	roleMenuList, err := roleService.GetRoleMenuList(roleId, isAdmin)
-	if err != nil {
-		responses.FailWithMessage(err.Error(), c)
-		return
-	}
-
-	if len(roleMenuList) == 0 || roleMenuList == nil {
-		responses.FailWithMessage("请联系管理人员设置菜单", c)
-		return
-	}
-
-	responses.OkWithData(roleMenuList, c)
-}
-
 // GetRolePage 获取角色列表-分页
 func (r *Role) GetRolePage(c *gin.Context) {
 	RoleRequest := requests.RoleRequest{}
diff --git a/api/controller/user.go b/api/controller/user.go
index af9197c..a82e944 100644
--- a/api/controller/user.go
+++ b/api/controller/user.go
@@ -264,3 +264,35 @@ func (b *User) LoginOut(c *gin.Context) {
 
 	responses.Ok(c)
 }
+
+// GetUserMenuList 获取用户菜单列表
+func (r *User) GetUserMenuList(c *gin.Context) {
+	roleId := c.GetInt64("RoleId")
+	if roleId == 0 {
+		responses.Fail(c)
+		return
+	}
+
+	roleService := service.RoleService{}
+
+	// 获取用户角色身份
+	isAdmin, err := roleService.GetRoleIden(c)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 获取角色菜单
+	roleMenuList, err := roleService.GetRoleMenuList(roleId, isAdmin)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	if len(roleMenuList) == 0 || roleMenuList == nil {
+		responses.FailWithMessage("请联系管理人员设置菜单", c)
+		return
+	}
+
+	responses.OkWithData(roleMenuList, c)
+}
diff --git a/api/router/router.go b/api/router/router.go
index 5dee5b7..2cc9a54 100644
--- a/api/router/router.go
+++ b/api/router/router.go
@@ -73,9 +73,6 @@ func privateRouter(r *gin.Engine, api controller.Api) {
 	// 角色
 	roleGroup := adminGroup.Group("/role")
 	{
-		// 获取登陆角色菜单列表
-		roleGroup.GET("menu", api.Role.GetRoleMenuList)
-
 		// 获取角色列表-分页
 		roleGroup.GET("", api.Role.GetRolePage)
 
@@ -137,6 +134,9 @@ func privateRouter(r *gin.Engine, api controller.Api) {
 
 		// 退出登陆
 		userGroup.PUT("loginout", api.User.LoginOut)
+
+		// 获取用户菜单列表
+		roleGroup.GET("menu", api.User.GetUserMenuList)
 	}
 
 	// 接口