|
@@ -9,11 +9,11 @@ import (
|
|
|
"strconv"
|
|
|
)
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.SysMenu) {
|
|
|
var allMenus []model.SysMenu
|
|
@@ -25,12 +25,11 @@ func getMenuTreeMap(authorityId string) (err error, treeMap map[string][]model.S
|
|
|
return err, treeMap
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) {
|
|
|
err, menuTree := getMenuTreeMap(authorityId)
|
|
@@ -41,12 +40,11 @@ func GetMenuTree(authorityId string) (err error, menus []model.SysMenu) {
|
|
|
return err, menus
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (err error) {
|
|
|
menu.Children = treeMap[menu.MenuId]
|
|
@@ -56,13 +54,10 @@ func getChildrenList(menu *model.SysMenu, treeMap map[string][]model.SysMenu) (e
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func GetInfoList() (err error, list interface{}, total int64) {
|
|
|
var menuList []model.SysBaseMenu
|
|
@@ -74,11 +69,11 @@ func GetInfoList() (err error, list interface{}, total int64) {
|
|
|
return err, menuList, total
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.SysBaseMenu) (err error) {
|
|
|
menu.Children = treeMap[strconv.Itoa(int(menu.ID))]
|
|
@@ -88,12 +83,11 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func AddBaseMenu(menu model.SysBaseMenu) (err error) {
|
|
|
if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
|
|
@@ -103,11 +97,10 @@ func AddBaseMenu(menu model.SysBaseMenu) (err error) {
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) {
|
|
|
var allMenus []model.SysBaseMenu
|
|
@@ -119,11 +112,10 @@ func getBaseMenuTreeMap() (err error, treeMap map[string][]model.SysBaseMenu) {
|
|
|
return err, treeMap
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) {
|
|
|
err, treeMap := getBaseMenuTreeMap()
|
|
@@ -134,12 +126,11 @@ func GetBaseMenuTree() (err error, menus []model.SysBaseMenu) {
|
|
|
return err, menus
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error) {
|
|
|
var auth model.SysAuthority
|
|
@@ -149,12 +140,11 @@ func AddMenuAuthority(menus []model.SysBaseMenu, authorityId string) (err error)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
func GetMenuAuthority(info *request.GetAuthorityId) (err error, menus []model.SysMenu) {
|
|
|
err = global.GVA_DB.Where("authority_id = ? ", info.AuthorityId).Order("sort").Find(&menus).Error
|