菜单int64转string
This commit is contained in:
+6
-28
@@ -116,44 +116,22 @@ func (r *RoleService) PutRoleStatus(roleId int64, roleStatus int) (bool, error)
|
||||
}
|
||||
|
||||
// GetRole 角色详情
|
||||
func (r *RoleService) GetRole(roleId int64) (*roleResponse.GetRole, error) {
|
||||
func (r *RoleService) GetRole(roleId int64) (adminRole *model.AdminRole, menuIds []int64, err error) {
|
||||
// 获取请求角色数据
|
||||
AdminRoleDao := dao.AdminRoleDao{}
|
||||
adminRole, err := AdminRoleDao.GetAdminRoleFirstById(roleId)
|
||||
adminRole, err = AdminRoleDao.GetAdminRoleFirstById(roleId)
|
||||
if err != nil || adminRole == nil {
|
||||
return nil, errors.New("非法操作")
|
||||
return nil, nil, errors.New("非法操作")
|
||||
}
|
||||
|
||||
// 获取角色权限菜单id
|
||||
AdminRoleMenuDao := dao.AdminRoleMenuDao{}
|
||||
menuIds, err := AdminRoleMenuDao.GetAdminRoleMenuIdByRoleId(roleId)
|
||||
menuIds, err = AdminRoleMenuDao.GetAdminRoleMenuIdByRoleId(roleId)
|
||||
if err != nil {
|
||||
return nil, errors.New("角色权限菜单获取失败")
|
||||
return nil, nil, errors.New("角色权限菜单获取失败")
|
||||
}
|
||||
|
||||
// 处理返回数据
|
||||
// 转换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 {
|
||||
return nil, errors.New("数据错误")
|
||||
}
|
||||
|
||||
GetRoleResponse := &roleResponse.GetRole{
|
||||
MenuIds: menuIdsString,
|
||||
RoleId: RoleId,
|
||||
RoleName: adminRole.RoleName,
|
||||
RoleStatus: adminRole.RoleStatus,
|
||||
IsAdmin: adminRole.IsAdmin,
|
||||
}
|
||||
|
||||
return GetRoleResponse, nil
|
||||
return adminRole, menuIds, nil
|
||||
}
|
||||
|
||||
// AddRole 新增角色
|
||||
|
||||
Reference in New Issue
Block a user