新增部门接口
This commit is contained in:
+7
-7
@@ -40,17 +40,17 @@ func (r *RoleService) GetRoleMenuList(roleId int64, isAdmin bool) ([]*roleRespon
|
||||
return []*roleResponse.GetRoleMenuList{}, nil
|
||||
}
|
||||
|
||||
var menuTree []*roleResponse.GetRoleMenuList
|
||||
var getRoleMenuListResponse []*roleResponse.GetRoleMenuList
|
||||
|
||||
if len(menuIDs) > 0 {
|
||||
// 构建菜单树
|
||||
menuTree = buildMenuTree(menuIDs, adminMenu)
|
||||
if menuTree == nil {
|
||||
getRoleMenuListResponse = buildMenuTree(menuIDs, adminMenu)
|
||||
if getRoleMenuListResponse == nil {
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
|
||||
return menuTree, nil
|
||||
return getRoleMenuListResponse, nil
|
||||
}
|
||||
|
||||
// 获取角色菜单-构建菜单树
|
||||
@@ -359,9 +359,9 @@ func (r *RoleService) DeleteRole(c *gin.Context, DeleteRoleRequest requests.Dele
|
||||
// 获取绑定该角色的用户
|
||||
maps := make(map[string]interface{})
|
||||
maps["role_id"] = v
|
||||
AdminUser, err := AdminUserDao.GetAdminUserList(maps)
|
||||
if AdminUser != nil {
|
||||
for _, user := range AdminUser {
|
||||
adminUser, err := AdminUserDao.GetAdminUserList(maps)
|
||||
if adminUser != nil {
|
||||
for _, user := range adminUser {
|
||||
// 修改对应用户角色id为0
|
||||
data := make(map[string]interface{})
|
||||
data["role_id"] = nil
|
||||
|
||||
Reference in New Issue
Block a user