fix

controllers/bi_dashboard.go

@@ -633,12 +633,11 @@ func (this *BIDaShboardController) PublicList() {
 		}
 
 		for _, vv := range respGroupNameListItemList {
-				tmpRespGroupListItem.DashboardList = append(tmpRespGroupListItem.DashboardList, vv)
+			tmpRespGroupListItem.DashboardList = append(tmpRespGroupListItem.DashboardList, vv)
 		}
 		resp = append(resp, tmpRespGroupListItem)
 	}
 
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
@@ -1281,8 +1280,7 @@ func (this *BIDaShboardController) ChartExcelPermission() {
 	}
 	lenList := len(list)
 
-	menuList := make([]*system.SysMenu, 0)
-
+	menuList := make([]*system.SysMenuSimple, 0)
 
 	chartExcelTypes, e := models.GetBusinessConfByKey("ChartExcelType")
 	if e != nil {
@@ -1296,21 +1294,28 @@ func (this *BIDaShboardController) ChartExcelPermission() {
 		typeMap[v] = true
 	}
 
-
 	for i := 0; i < lenList; i++ {
 		item := list[i]
 		if !typeMap[item.LevelPath] && !typeMap[item.Path] {
 			continue
 		}
-		menuList = append(menuList, list[i])
+		newItem := &system.SysMenuSimple{
+			MenuId:   item.MenuId,
+			ParentId: item.ParentId,
+			Name:     item.Name,
+			Sort:     item.Sort,
+			Path:     item.Path,
+			NameEn:   item.NameEn,
+		}
+		if item.IsLevel == 1 {
+			newItem.Path = item.LevelPath
+		}
+		menuList = append(menuList, newItem)
 	}
 
-
-
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "查询成功"
 	br.Data = menuList
 	return
-}
+}

models/system/sys_menu.go

@@ -192,6 +192,17 @@ func GetMenuButtonApisByRoleId(roleId int) (items []*SysMenu, err error) {
 	return
 }
 
+// SysMenuSimple ETA商家菜单
+type SysMenuSimple struct {
+	MenuId     int       `orm:"column(menu_id);pk"`
+	ParentId   int       `description:"父级菜单ID"`
+	Name       string    `description:"菜单名称或者按钮名称"`
+	Sort       string    `description:"排序"`
+	Path       string    `description:"路由地址"`
+	NameEn     string    `description:"菜单名称或者按钮名称（英文）"`
+}
+
+
 // GetMenuByRoleIds 根据管理员多个角色查询菜单ID
 func GetMenuByRoleIds(roleIds string) (items []*SysMenu, err error) {
 	sql := ` SELECT DISTINCT a.* FROM sys_menu AS a