新增菜单详情，增加返回api。修改部门详情返回数据

api/controller/menu.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
 	"hospital-admin-api/api/responses/menuResponse"
@@ -138,8 +137,8 @@ func (r *Menu) PutMenu(c *gin.Context) {
 	}
 
 	// 业务处理
-	MenuService := service.MenuService{}
-	_, err = MenuService.PutMenu(menuId, MenuRequest.PutMenu)
+	menuService := service.MenuService{}
+	_, err = menuService.PutMenu(menuId, MenuRequest.PutMenu)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
@@ -188,42 +187,28 @@ func (r *Menu) GetMenu(c *gin.Context) {
 		return
 	}
 
-	AdminMenuDao := dao.AdminMenuDao{}
+	menuService := service.MenuService{}
 
-	adminMenu, _ := AdminMenuDao.GetAdminMenuById(menuId)
-	if adminMenu == nil {
-		responses.Fail(c)
-		return
-	}
-
-	// 转换int64为string
-	MenuId := strconv.FormatInt(adminMenu.MenuId, 10)
+	// 获取菜单详情
+	adminMenu, err := menuService.GetMenu(menuId)
 	if err != nil {
-		responses.Fail(c)
+		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
-	ParentId := strconv.FormatInt(adminMenu.ParentId, 10)
+	// 获取菜单api
+	getAdminMenuApis, err := menuService.GetAdminMenuApi(menuId)
 	if err != nil {
-		responses.Fail(c)
+		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
-	GetMenuResponse := &menuResponse.GetMenu{
-		MenuId:     MenuId,
-		MenuName:   adminMenu.MenuName,
-		MenuTitle:  adminMenu.MenuTitle,
-		ParentId:   ParentId,
-		MenuStatus: adminMenu.MenuStatus,
-		MenuType:   adminMenu.MenuType,
-		Permission: adminMenu.Permission,
-		OrderNum:   adminMenu.OrderNum,
-		Icon:       adminMenu.Icon,
-		Path:       adminMenu.Path,
-		Component:  adminMenu.Component,
-		CreatedAt:  adminMenu.CreatedAt,
-		UpdatedAt:  adminMenu.UpdatedAt,
+	// 处理返回值
+	getMenuResponse, err := menuResponse.GetMenuResponse(adminMenu, getAdminMenuApis)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
 	}
 
-	responses.OkWithData(GetMenuResponse, c)
+	responses.OkWithData(getMenuResponse, c)
 }