Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions logic/menu_logic.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,16 @@ func (l MenuLogic) GetTree(c *gin.Context, req interface{}) (data interface{}, r
return nil, ReqAssertErr
}
_ = c

ctxUser, err := isql.User.GetCurrentLoginUser(c)
if err != nil {
return nil, tools.NewMySqlError(fmt.Errorf("获取当前登陆用户信息失败"))
}
roleIds := []uint{}
for _, role := range ctxUser.Roles {
roleIds = append(roleIds, role.ID)
}
var menus []*model.Menu
menus, err := isql.Menu.List()
menus, err = isql.Menu.ListUserMenus(roleIds)
if err != nil {
return nil, tools.NewMySqlError(fmt.Errorf("获取资源列表失败: " + err.Error()))
}
Expand Down
6 changes: 6 additions & 0 deletions service/isql/menu_isql.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ func (s MenuService) List() (menus []*model.Menu, err error) {
return menus, err
}

// List 获取数据列表
func (s MenuService) ListUserMenus(roleIds []uint) (menus []*model.Menu, err error) {
err = common.DB.Where("id IN (select menu_id as id from role_menus where role_id IN (?))", roleIds).Order("sort").Find(&menus).Error
return menus, err
}

// 批量删除资源
func (s MenuService) Delete(menuIds []uint) error {
return common.DB.Where("id IN (?)", menuIds).Select("Roles").Unscoped().Delete(&model.Menu{}).Error
Expand Down
4 changes: 3 additions & 1 deletion service/isql/user_isql.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ func (s UserService) Update(user *model.User) error {

// 如果更新成功就更新用户信息缓存
if err == nil {
userInfoCache.Set(user.Username, *user, cache.DefaultExpiration)
userDb := &model.User{}
common.DB.Where("username = ?", user.Username).Preload("Roles").First(&userDb)
userInfoCache.Set(user.Username, *userDb, cache.DefaultExpiration)
}
return err
}
Expand Down