fix

models/classify.go

@@ -45,6 +45,7 @@ type Classify struct {
 	Level                int       `description:"层级"`
 	HasChild             int       `description:"是否有子级别，0：下面没有子分类，1：下面有子分类；默认：0"`
 	ReportDetailShowType int       `description:"报告详情的展示类型：1-拼接；2:目录"`
+	ClassifyType         int       `description:"分类类型：0研报，1ppt，2研报和ppt"`
 }
 
 type ClassifyVO struct {

models/cloud_disk_resource.go

@@ -1,9 +1,9 @@
 package models
 
 import (
+	"eta/eta_api/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"eta/eta_api/utils"
 	"strings"
 	"time"
 )
@@ -152,7 +152,7 @@ type CloudDiskMenuResourcePath struct {
 // GetCloudDiskMenuAndResourceList UNION获取云盘列表数据
 func GetCloudDiskMenuAndResourceList(menuCond, resourceCond string, menuPars, resourcePars []interface{}, orderRule string) (items []*CloudDiskListItem, err error) {
 	o := orm.NewOrm()
-	base := `SELECT menu_id AS item_id, menu_name AS item_name, 1 AS item_type, parent_id, size, "" AS resource_url, "" AS item_icon, admin_id, admin_name, create_time FROM cloud_disk_menu
+	base := `SELECT menu_id AS item_id, menu_name AS item_name, 1 AS item_type, parent_id, size, '' AS resource_url, '' AS item_icon, admin_id, admin_name, create_time FROM cloud_disk_menu
 			WHERE 1=1 %s
 			UNION
 			SELECT resource_id, CONCAT(resource_name,resource_suffix), 2, menu_id, size, resource_url, resource_icon, admin_id, admin_name, create_time FROM cloud_disk_resource

models/permission.go

@@ -8,7 +8,7 @@ import (
 
 // ChartPermissionSearchKeyWordMapping 权限相关
 type ChartPermissionSearchKeyWordMapping struct {
-	Id                 int    `description:"id" json:"-"`
+	Id                 int    `orm:"column(id);pk" description:"id" json:"-"`
 	ChartPermissionId  int    `description:"权限id"`
 	KeyWord            string `description:"二级分类名称"`
 	From               string `description:"类型标识" json:"-"`

models/report_author.go

@@ -7,7 +7,7 @@ import (
 )
 
 type ReportAuthor struct {
-	Id           int       `orm:"column(id)" description:"报告作者ID"`
+	Id           int       `orm:"column(id);pk" description:"报告作者ID"`
 	ReportAuthor string    `description:"报告作者名称"`
 	AuthorType   int       `description:"类型，1：中文；2：英文"`
 	Enable       int       `description:"是否启用，0：禁用，1：启用"`

services/classify.go

@@ -279,6 +279,7 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 	classify.ReportDetailShowType = 1 //默认列表格式
 	classify.IsShow = 1
 	classify.Level = level
+	classify.ClassifyType = 0
 
 	err = models.AddClassify(classify)
 	if err != nil {