public/gfast
1
0
Fork 0
mirror of https://github.com/tiger1103/gfast.git synced 2026-09-21 18:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复权限控制

Browse Source
This commit is contained in:
yxh
2021-07-21 15:18:19 +08:00
parent f7fc84d6b2
commit 0983cebe1d
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/system/service/sys_auth_rule.go
+19 -3
View File
@@ -14,8 +14,8 @@ type rule struct {
var Rule = new(rule)
//获取status==1的菜单列表
func (s *rule) GetMenuIsStatusList() ([]*model.SysAuthRuleInfoRes, error) {
// GetIsMenuStatusList 获取isMenu=0|1且status=1的菜单列表
func (s *rule) GetIsMenuStatusList() ([]*model.SysAuthRuleInfoRes, error) {
list, err := s.GetMenuList()
if err != nil {
return nil, err
@@ -99,12 +99,13 @@ func (s *rule) GetIsButtonStatusList() ([]*model.SysAuthRuleInfoRes, error) {
return gList, nil
}
// GetIsMenuList 获取MenuType==0,1菜单列表
func (s *rule) GetIsMenuList() ([]*model.SysAuthRuleInfoRes, error) {
list, err := s.GetMenuList()
if err != nil {
return nil, err
}
var gList = make([]*model.SysAuthRuleInfoRes, 0)
var gList = make([]*model.SysAuthRuleInfoRes, 0, len(list))
for _, v := range list {
if v.MenuType == 0 || v.MenuType == 1 {
gList = append(gList, v)
@@ -113,6 +114,21 @@ func (s *rule) GetIsMenuList() ([]*model.SysAuthRuleInfoRes, error) {
return gList, nil
}
// GetMenuIsStatusList 获取status==1的菜单列表
func (s *rule) GetMenuIsStatusList() ([]*model.SysAuthRuleInfoRes, error) {
list, err := s.GetMenuList()
if err != nil {
return nil, err
}
var gList = make([]*model.SysAuthRuleInfoRes, 0, len(list))
for _, v := range list {
if v.Status == 1 {
gList = append(gList, v)
}
}
return gList, nil
}
//检查菜单规则是否存在
func (s *rule) CheckMenuNameUnique(name string, id int) bool {
return dao.SysAuthRule.CheckMenuNameUnique(name, id)
app/system/service/sys_user.go
+2 -2
View File
@@ -200,7 +200,7 @@ func (s *sysUser) GetPermissions(roleIds []uint) ([]string, error) {
func (s *sysUser) GetAllMenus() (menus []UserMenus, err error) {
//获取所有开启的菜单
var allMenus []*model.SysAuthRuleInfoRes
allMenus, err = Rule.GetMenuIsStatusList()
allMenus, err = Rule.GetIsMenuStatusList()
if err != nil {
return
}
@@ -231,7 +231,7 @@ func (s *sysUser) GetAdminMenusByRoleIds(roleIds []uint) (menus []UserMenus, err
}
}
//获取所有开启的菜单
allMenus, err := Rule.GetMenuIsStatusList()
allMenus, err := Rule.GetIsMenuStatusList()
if err != nil {
return
}