gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改角色菜单

Browse Source
This commit is contained in:
wucongxing 2023-07-04 19:09:09 +08:00
parent b393570e86
commit 2944d42281
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/controller/adminRole.go
View File

@ -187,8 +187,16 @@ func (r *Role) GetRole(c *gin.Context) {
return return
} }
// 获取角色身份
roleService := service.RoleService{}
isAdmin, err := roleService.GetRoleIden(c)
if err != nil {
responses.FailWithMessage(err.Error(), c)
return
}
RoleService := service.RoleService{} RoleService := service.RoleService{}
adminRole, menuIds, err := RoleService.GetRole(roleId) adminRole, menuIds, err := RoleService.GetRole(roleId, isAdmin)
if err != nil { if err != nil {
responses.FailWithMessage(err.Error(), c) responses.FailWithMessage(err.Error(), c)
return return

18
api/service/role.go
View File

@ -140,7 +140,7 @@ func (r *RoleService) PutRoleStatus(roleId int64, roleStatus int) (bool, error)
} }
// GetRole 角色详情 // GetRole 角色详情
func (r *RoleService) GetRole(roleId int64) (adminRole *model.AdminRole, menuIds []int64, err error) { func (r *RoleService) GetRole(roleId int64, isAdmin bool) (adminRole *model.AdminRole, menuIds []int64, err error) {
// 获取请求角色数据 // 获取请求角色数据
AdminRoleDao := dao.AdminRoleDao{} AdminRoleDao := dao.AdminRoleDao{}
adminRole, err = AdminRoleDao.GetAdminRoleFirstById(roleId) adminRole, err = AdminRoleDao.GetAdminRoleFirstById(roleId)
@ -149,10 +149,18 @@ func (r *RoleService) GetRole(roleId int64) (adminRole *model.AdminRole, menuIds
} }
// 获取角色权限菜单id // 获取角色权限菜单id
AdminRoleMenuDao := dao.AdminRoleMenuDao{} if isAdmin {
menuIds, err = AdminRoleMenuDao.GetAdminRoleMenuIdByRoleId(roleId) adminMenuDao := dao.AdminMenuDao{}
if err != nil { menuIds, err = adminMenuDao.GetAdminMenuId()
return nil, nil, errors.New("角色权限菜单获取失败") if err != nil {
return nil, nil, errors.New("角色权限菜单获取失败")
}
} else {
AdminRoleMenuDao := dao.AdminRoleMenuDao{}
menuIds, err = AdminRoleMenuDao.GetAdminRoleMenuIdByRoleId(roleId)
if err != nil {
return nil, nil, errors.New("角色权限菜单获取失败")
}
} }
return adminRole, menuIds, nil return adminRole, menuIds, nil