perf👌 : 岗位、角色功能改造

This commit is contained in:
wenjianzhang committed 2021-01-16 21:46:57 +08:00
1 parent ad42b6489a
commit 792c8874aa
21 files changed
+1575 -103

No files matched your search

+81 -17
View File
@@ -16,6 +16,23 @@ type SysMenu struct {
}
// GetSysMenuPage 获取SysMenu列表
func (e *SysMenu) GetSysMenuPage(c *dto.SysMenuSearch) (*[]models.SysMenu, error) {
var m = make([]models.SysMenu, 0)
var err error
var menu = make([]models.SysMenu, 0)
err = e.getSysMenuPage(c, &menu)
for i := 0; i < len(menu); i++ {
if menu[i].ParentId != 0 {
continue
}
menusInfo := menuCall(&menu, menu[i])
m = append(m, menusInfo)
}
return &m, err
}
// getSysMenuPage 菜单列表
func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) error {
var err error
var data models.SysMenu
@@ -23,6 +40,7 @@ func (e *SysMenu) getSysMenuPage(c *dto.SysMenuSearch, list *[]models.SysMenu) e
err = e.Orm.Model(&data).
Scopes(
cDto.OrderDest("sort", false),
cDto.MakeCondition(c.GetNeedSearch()),
).
Find(list).Error
@@ -145,7 +163,7 @@ func (e *SysMenu) GetSysMenuList(c *dto.SysMenuSearch, list *[]models.SysMenu) e
}
// SetSysMenuTree 设置菜单数据
func (e *SysMenu) SetSysMenuTree() (c *dto.SysMenuSearch, m []dto.MenuLabel, err error) {
func (e *SysMenu) SetSysMenuLabel(c *dto.SysMenuSearch) (m []dto.MenuLabel, err error) {
var list []models.SysMenu
err = e.GetSysMenuList(c, &list)
@@ -164,6 +182,29 @@ func (e *SysMenu) SetSysMenuTree() (c *dto.SysMenuSearch, m []dto.MenuLabel, err
return
}
// 左侧菜单
func (e *SysMenu) GetSysMenuByRoleName(roleName string) (Menus []models.SysMenu, err error) {
var table *gorm.DB
var data models.SysMenu
msgID := e.MsgID
if roleName == "admin" {
table = e.Orm.Model(&data).Select("sys_menu.*")
table = table.Where(" menu_type in ('M','C')")
} else {
table = e.Orm.Model(&data).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id")
table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName)
}
err = table.Order("sort").Find(&Menus).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
return
}
return
}
// menuLabelCall 递归构造组织数据
func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
list := *elist
@@ -193,21 +234,6 @@ func menuLabelCall(elist *[]models.SysMenu, dept dto.MenuLabel) dto.MenuLabel {
return dept
}
// GetMenuList 菜单列表
func (e *SysMenu) GetSysMenuPage() (c *dto.SysMenuSearch, m []models.SysMenu, err error) {
err = e.getSysMenuPage(c,&m)
m = make([]models.SysMenu, 0)
for i := 0; i < len(m); i++ {
if m[i].ParentId != 0 {
continue
}
menusInfo := menuCall(&m, m[i])
m = append(m, menusInfo)
}
return
}
func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu {
list := *menulist
@@ -246,4 +272,42 @@ func menuCall(menulist *[]models.SysMenu, menu models.SysMenu) models.SysMenu {
}
menu.Children = min
return menu
}
}
func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) {
menus, err := e.getByRoleName(roleName)
m = make([]models.SysMenu, 0)
for i := 0; i < len(menus); i++ {
if menus[i].ParentId != 0 {
continue
}
menusInfo := menuCall(&menus, menus[i])
m = append(m, menusInfo)
}
return
}
func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err error) {
var data models.SysMenu
msgID := e.MsgID
var table *gorm.DB
if roleName == "admin" {
table = e.Orm.Model(&data).Select("sys_menu.*")
table = table.Where(" menu_type in ('M','C')")
} else {
table = e.Orm.Model(&data).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id")
table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName)
}
err = table.Scopes(
cDto.OrderDest("sort", false),
).Find(&Menus).Error
if err != nil {
log.Errorf("msgID[%s] db error:%s", msgID, err)
return
}
return
}