菜单int64转string

api/controller/menu.go

@@ -5,6 +5,7 @@ import (
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
+	"hospital-admin-api/api/responses/menuResponse"
 	"hospital-admin-api/api/service"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
@@ -60,13 +61,13 @@ func (r *Menu) AddMenu(c *gin.Context) {
 	}
 
 	// 非模块无父级
-	if MenuRequest.AddMenu.ParentId == 0 && MenuRequest.AddMenu.MenuType != 1 {
+	if MenuRequest.AddMenu.ParentId == "0" && MenuRequest.AddMenu.MenuType != 1 {
 		responses.FailWithMessage("请选择父节点", c)
 		return
 	}
 
 	// 模块存在父级
-	if MenuRequest.AddMenu.ParentId != 0 && MenuRequest.AddMenu.MenuType == 1 {
+	if MenuRequest.AddMenu.ParentId != "0" && MenuRequest.AddMenu.MenuType == 1 {
 		responses.FailWithMessage("顶级菜单，无法添加上级菜单", c)
 		return
 	}
@@ -125,13 +126,13 @@ func (r *Menu) PutMenu(c *gin.Context) {
 	}
 
 	// 非模块无父级
-	if MenuRequest.PutMenu.ParentId == 0 && MenuRequest.PutMenu.MenuType != 1 {
+	if MenuRequest.PutMenu.ParentId == "0" && MenuRequest.PutMenu.MenuType != 1 {
 		responses.FailWithMessage("请选择父节点", c)
 		return
 	}
 
 	// 模块存在父级
-	if MenuRequest.PutMenu.ParentId != 0 && MenuRequest.PutMenu.MenuType == 1 {
+	if MenuRequest.PutMenu.ParentId != "0" && MenuRequest.PutMenu.MenuType == 1 {
 		responses.FailWithMessage("顶级菜单，无法添加上级菜单", c)
 		return
 	}
@@ -195,5 +196,34 @@ func (r *Menu) GetMenu(c *gin.Context) {
 		return
 	}
 
-	responses.OkWithData(adminMenu, c)
+	// 转换int64为string
+	MenuId := strconv.FormatInt(adminMenu.MenuId, 10)
+	if err != nil {
+		responses.Fail(c)
+		return
+	}
+
+	ParentId := strconv.FormatInt(adminMenu.ParentId, 10)
+	if err != nil {
+		responses.Fail(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,
+	}
+
+	responses.OkWithData(GetMenuResponse, c)
 }

api/controller/role.go

@@ -186,12 +186,35 @@ func (r *Role) GetRole(c *gin.Context) {
 	}
 
 	RoleService := service.RoleService{}
-	GetRoleResponse, err := RoleService.GetRole(roleId)
+	adminRole, menuIds, err := RoleService.GetRole(roleId)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
+	// 处理返回值
+	// 转换int64为string
+	var menuIdsString []string
+	for _, menuId := range menuIds {
+		menuId := strconv.FormatInt(menuId, 10)
+		menuIdsString = append(menuIdsString, menuId)
+	}
+
+	// 转换int64为string
+	RoleId := strconv.FormatInt(adminRole.RoleId, 10)
+	if err != nil {
+		responses.Fail(c)
+		return
+	}
+
+	GetRoleResponse := &roleResponse.GetRole{
+		MenuIds:    menuIdsString,
+		RoleId:     RoleId,
+		RoleName:   adminRole.RoleName,
+		RoleStatus: adminRole.RoleStatus,
+		IsAdmin:    adminRole.IsAdmin,
+	}
+
 	responses.OkWithData(GetRoleResponse, c)
 }