diff --git a/modules/role/dto/role_dto.go b/modules/role/dto/role_dto.go index e7d0d97..2c7b027 100644 --- a/modules/role/dto/role_dto.go +++ b/modules/role/dto/role_dto.go @@ -96,7 +96,14 @@ type RoleResponse struct { // ClientID string `json:"client_id"` Client pkgdto.IdNameResponse `json:"client"` Permissions []RolePermissionsResponse `json:"permissions,omitempty"` - Menus []pkgdto.IdNameResponse `json:"menus,omitempty"` + Menus []RoleMenuResponse `json:"menus,omitempty"` +} + +type RoleMenuResponse struct { + ID string `json:"id"` + Name string `json:"name"` + IconUrl string `json:"icon_url"` + Url string `json:"url"` } type RolePermissionsResponse struct { diff --git a/modules/role/service/role_service.go b/modules/role/service/role_service.go index 051d229..b5ab470 100644 --- a/modules/role/service/role_service.go +++ b/modules/role/service/role_service.go @@ -479,11 +479,13 @@ func ToRoleResponse(role entities.M_Role) dto.RoleResponse { } } - var menus []pkgdto.IdNameResponse + var menus []dto.RoleMenuResponse for _, m := range role.Menus { - menus = append(menus, pkgdto.IdNameResponse{ - ID: m.ID.String(), - Name: m.Name, + menus = append(menus, dto.RoleMenuResponse{ + ID: m.ID.String(), + Name: m.Name, + IconUrl: m.IconUrl, + Url: m.Url, }) }