Merge remote-tracking branch 'origin/main'

piexlmax · piexlmax · commit 3ae49055a6d3 · 2022-05-11T22:22:03.000+08:00
diff --git a/server/service/system/sys_menu.go b/server/service/system/sys_menu.go
@@ -125,7 +125,7 @@ func (menuService *MenuService) AddBaseMenu(menu system.SysBaseMenu) error {
 func (menuService *MenuService) getBaseMenuTreeMap() (err error, treeMap map[string][]system.SysBaseMenu) {
 	var allMenus []system.SysBaseMenu
 	treeMap = make(map[string][]system.SysBaseMenu)
-	err = global.GVA_DB.Order("sort").Preload("MenuBtn").Preload("Parameters").Preload("Parameters").Find(&allMenus).Error
+	err = global.GVA_DB.Order("sort").Preload("MenuBtn").Preload("Parameters").Find(&allMenus).Error
 	for _, v := range allMenus {
 		treeMap[v.ParentId] = append(treeMap[v.ParentId], v)
 	}

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func (menuService *MenuService) AddBaseMenu(menu system.SysBaseMenu) error {`
`125`	`125`	`func (menuService *MenuService) getBaseMenuTreeMap() (err error, treeMap map[string][]system.SysBaseMenu) {`
`126`	`126`	`var allMenus []system.SysBaseMenu`
`127`	`127`	`treeMap = make(map[string][]system.SysBaseMenu)`
`128`		`- err = global.GVA_DB.Order("sort").Preload("MenuBtn").Preload("Parameters").Preload("Parameters").Find(&allMenus).Error`
	`128`	`+ err = global.GVA_DB.Order("sort").Preload("MenuBtn").Preload("Parameters").Find(&allMenus).Error`
`129`	`129`	`for _, v := range allMenus {`
`130`	`130`	`treeMap[v.ParentId] = append(treeMap[v.ParentId], v)`
`131`	`131`	`}`