修改菜单返回

api/service/menu.go

@@ -17,7 +17,7 @@ type MenuService struct{}
 func (r *MenuService) GetMenuList() ([]*menuResponse.GetMenuList, error) {
 	// 获取全部菜单
 	AdminMenuDao := dao.AdminMenuDao{}
-	adminMenu, _ := AdminMenuDao.GetAdminMenuListSortOrderNum()
+	adminMenu, _ := AdminMenuDao.GetAdminMenuListNonButtonNormalSortOrderNum()
 	if adminMenu == nil {
 		return nil, nil
 	}

api/service/role.go

@@ -34,8 +34,8 @@ func (r *RoleService) GetRoleMenuList(roleId int64, isAdmin bool) ([]*roleRespon
 		}
 	}
 
-	// 获取全部正常菜单列表
-	adminMenu, _ := AdminMenuDao.GetAdminMenuListNormalSortOrderNum()
+	// 获取全部正常非按钮菜单列表
+	adminMenu, _ := AdminMenuDao.GetAdminMenuListNonButtonNormalSortOrderNum()
 	if adminMenu == nil {
 		return []*roleResponse.GetRoleMenuList{}, nil
 	}