fix: resolve platform relation identities

This commit is contained in:
2026-07-27 10:11:07 +08:00
parent 98995d6968
commit 2e62238416
11 changed files with 437 additions and 80 deletions

View File

@@ -61,15 +61,53 @@ func UpdatePlatformRole(ctx *gin.Context) {
}
type platformMenuRequest struct {
ParentID uint64 `json:"parent_id"`
MenuCode string `json:"menu_code" binding:"required,max=64"`
Name string `json:"name" binding:"required,max=64"`
Icon string `json:"icon" binding:"max=64"`
Path string `json:"path" binding:"max=255"`
SortNo int `json:"sort_no"`
ParentIdentity string `json:"parent_identity"`
MenuCode string `json:"menu_code" binding:"required,max=64"`
Name string `json:"name" binding:"required,max=64"`
Icon string `json:"icon" binding:"max=64"`
Path string `json:"path" binding:"max=255"`
SortNo int `json:"sort_no"`
}
func GetPlatformMenu(ctx *gin.Context) { getByIdentity[models.PlatformMenu](ctx) }
type platformMenuView struct {
Identity string `json:"identity"`
ParentIdentity string `json:"parent_identity,omitempty"`
MenuCode string `json:"menu_code"`
Name string `json:"name"`
Icon string `json:"icon"`
Path string `json:"path"`
SortNo int `json:"sort_no"`
Status string `json:"status"`
}
func platformMenuViews(list []models.PlatformMenu) []platformMenuView {
identities := make(map[uint64]string, len(list))
for _, item := range list {
identities[item.ID] = item.Identity
}
views := make([]platformMenuView, 0, len(list))
for _, item := range list {
views = append(views, platformMenuView{Identity: item.Identity, ParentIdentity: identities[item.ParentID], MenuCode: item.MenuCode, Name: item.Name, Icon: item.Icon, Path: item.Path, SortNo: item.SortNo, Status: item.Status})
}
return views
}
func GetPlatformMenu(ctx *gin.Context) {
var menu models.PlatformMenu
if err := impl.DBService.Where("identity = ?", ctx.Param("identity")).First(&menu).Error; err != nil {
respondRecordError(ctx, err)
return
}
list := []models.PlatformMenu{menu}
if menu.ParentID != 0 {
var parent models.PlatformMenu
if err := impl.DBService.Select("id", "identity").First(&parent, menu.ParentID).Error; err == nil {
list = append(list, parent)
}
}
views := platformMenuViews(list)
infra.Response.Success(ctx, views[0])
}
func CreatePlatformMenu(ctx *gin.Context) {
var request platformMenuRequest
@@ -77,7 +115,12 @@ func CreatePlatformMenu(ctx *gin.Context) {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
menu := models.PlatformMenu{Entity: newEntity("enabled"), ParentID: request.ParentID, MenuCode: request.MenuCode, Name: request.Name, Icon: request.Icon, Path: request.Path, SortNo: request.SortNo}
parentID, err := resolveIdentityID(&models.PlatformMenu{}, request.ParentIdentity, false)
if err != nil {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
menu := models.PlatformMenu{Entity: newEntity("enabled"), ParentID: parentID, MenuCode: request.MenuCode, Name: request.Name, Icon: request.Icon, Path: request.Path, SortNo: request.SortNo}
if err := impl.DBService.Create(&menu).Error; err != nil {
infra.Response.Error(ctx, err)
return
@@ -91,7 +134,12 @@ func UpdatePlatformMenu(ctx *gin.Context) {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
updateAllowedByIdentity(ctx, &models.PlatformMenu{}, gin.H{"parent_id": request.ParentID, "name": request.Name, "icon": request.Icon, "path": request.Path, "sort_no": request.SortNo}, []string{"parent_id", "name", "icon", "path", "sort_no"})
parentID, err := resolveIdentityID(&models.PlatformMenu{}, request.ParentIdentity, false)
if err != nil {
infra.Response.Error(ctx, errcode.ErrInvalidArgument)
return
}
updateAllowedByIdentity(ctx, &models.PlatformMenu{}, gin.H{"parent_id": parentID, "name": request.Name, "icon": request.Icon, "path": request.Path, "sort_no": request.SortNo}, []string{"parent_id", "name", "icon", "path", "sort_no"})
}
type platformRoleMenusRequest struct {
@@ -189,7 +237,7 @@ func ListPlatformMenu(ctx *gin.Context) {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, gin.H{"total": len(list), "list": list})
infra.Response.Success(ctx, gin.H{"total": len(list), "list": platformMenuViews(list)})
}
// ListPlatfromAccount 查询平台账号列表,手机号在展示层脱敏。