提交
This commit is contained in:
@@ -39,7 +39,7 @@ func (c *PermissionController) ListRoles(ctx *gin.Context) {
|
||||
perms := make([]dto.PermissionVO, 0, len(r.Permissions))
|
||||
for _, p := range r.Permissions {
|
||||
perms = append(perms, dto.PermissionVO{
|
||||
ID: p.ID,
|
||||
ID: dto.StringID(p.ID),
|
||||
Code: p.Code,
|
||||
Name: p.Name,
|
||||
Resource: p.Resource,
|
||||
@@ -48,7 +48,7 @@ func (c *PermissionController) ListRoles(ctx *gin.Context) {
|
||||
})
|
||||
}
|
||||
vos = append(vos, dto.RoleVO{
|
||||
ID: r.ID,
|
||||
ID: dto.StringID(r.ID),
|
||||
Name: r.Name,
|
||||
DisplayName: r.DisplayName,
|
||||
Description: r.Description,
|
||||
@@ -145,7 +145,11 @@ func (c *PermissionController) SetRolePermissions(ctx *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if err := c.permService.SetRolePermissions(roleID, req.PermissionIDs); err != nil {
|
||||
permIDs := make([]uint64, len(req.PermissionIDs))
|
||||
for i, id := range req.PermissionIDs {
|
||||
permIDs[i] = uint64(id)
|
||||
}
|
||||
if err := c.permService.SetRolePermissions(roleID, permIDs); err != nil {
|
||||
utils.BadRequest(ctx, err.Error())
|
||||
return
|
||||
}
|
||||
@@ -167,7 +171,7 @@ func (c *PermissionController) ListPermissions(ctx *gin.Context) {
|
||||
vos := make([]dto.PermissionVO, 0, len(perms))
|
||||
for _, p := range perms {
|
||||
vos = append(vos, dto.PermissionVO{
|
||||
ID: p.ID,
|
||||
ID: dto.StringID(p.ID),
|
||||
Code: p.Code,
|
||||
Name: p.Name,
|
||||
Resource: p.Resource,
|
||||
@@ -238,7 +242,11 @@ func (c *PermissionController) SetUserRoles(ctx *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if err := c.permService.SetUserRoles(userID, req.RoleIDs); err != nil {
|
||||
roleIDs := make([]uint64, len(req.RoleIDs))
|
||||
for i, id := range req.RoleIDs {
|
||||
roleIDs[i] = uint64(id)
|
||||
}
|
||||
if err := c.permService.SetUserRoles(userID, roleIDs); err != nil {
|
||||
utils.BadRequest(ctx, err.Error())
|
||||
return
|
||||
}
|
||||
@@ -272,7 +280,7 @@ func (c *PermissionController) GetUserPermissions(ctx *gin.Context) {
|
||||
roleVOs := make([]dto.RoleVO, 0, len(roles))
|
||||
for _, r := range roles {
|
||||
roleVOs = append(roleVOs, dto.RoleVO{
|
||||
ID: r.ID,
|
||||
ID: dto.StringID(r.ID),
|
||||
Name: r.Name,
|
||||
DisplayName: r.DisplayName,
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user