角色菜单优化

controllers/classify.go

@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"encoding/json"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"eta/eta_api/models"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
+	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -35,7 +35,7 @@ func (this *ClassifyController) Add() {
 	}
 
 	// 获取系统菜单, 如果没有对应的字段的特殊处理项, 则忽略必填
-	menus, e := system.GetSysMenuItemsByCondition("", make([]interface{}, 0), []string{}, ``)
+	menus, e := system.GetSysMenuItemsByCondition(` AND hidden = 0`, make([]interface{}, 0), []string{}, ``)
 	if e != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "获取菜单列表失败, Err: " + e.Error()
@@ -362,7 +362,7 @@ func (this *ClassifyController) Edit() {
 	}
 
 	// 获取系统菜单, 如果没有对应的字段的特殊处理项, 则忽略必填
-	menus, e := system.GetSysMenuItemsByCondition("", make([]interface{}, 0), []string{}, ``)
+	menus, e := system.GetSysMenuItemsByCondition(` AND hidden = 0`, make([]interface{}, 0), []string{}, ``)
 	if e != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "获取菜单列表失败, Err: " + e.Error()

controllers/sandbox/sandbox.go

@@ -328,7 +328,7 @@ func (this *SandboxController) Save() {
 
 	var sandboxResp *sandbox.SandboxSaveResp
 	// 获取系统菜单, 如果没有对应的字段的特殊处理项, 则忽略必填
-	menus, e := system.GetSysMenuItemsByCondition("", make([]interface{}, 0), []string{}, ``)
+	menus, e := system.GetSysMenuItemsByCondition(` AND hidden = 0`, make([]interface{}, 0), []string{}, ``)
 	if e != nil {
 		br.Msg = "保存失败"
 		br.ErrMsg = "获取菜单列表失败, Err: " + e.Error()

controllers/sys_role.go

@@ -507,7 +507,7 @@ func (this *SysRoleController) SysRoleMenuAuthList() {
 	}
 
 	order := `sort ASC, create_time DESC, menu_id DESC`
-	list, e := system.GetSysMenuItemsByCondition("", make([]interface{}, 0), []string{}, order)
+	list, e := system.GetSysMenuItemsByCondition(` AND hidden = 0`, make([]interface{}, 0), []string{}, order)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取菜单列表失败, Err: " + e.Error()

models/system/sys_menu.go

@@ -131,7 +131,7 @@ func GetMenuButtonsByRoleId(roleId int) (items []*SysMenu, err error) {
 				sys_menu AS r
 			JOIN sys_role_menu AS rm ON r.menu_id = rm.menu_id AND rm.type = 0
 			WHERE
-				rm.role_id = ? AND r.menu_type <> 0
+				rm.role_id = ? AND r.menu_type <> 0 AND r.hidden = 0
 			ORDER BY
 				r.sort ASC,
 				r.create_time DESC`