Merge branch 'bzq/306_report_classify' of eta_gn_server/eta_report into debug

controllers/report_open.go

@@ -88,6 +88,7 @@ func (this *ReportOpenController) ClassifyTree() {
 	}
 
 	resp := services.GetReportClassifyTreeRecursive(list, 0)
+	resp = services.RecursiveFilterNoChildTreeClassify(resp)
 
 	br.Data = resp
 	br.Ret = 200

models/classify.go

@@ -81,6 +81,7 @@ type ClassifyTreeItem struct {
 	Sort         int                 `description:"排序"`
 	Level        int                 `description:"层级"`
 	ClassifyType int                 `description:"分类类型：1-研报；2-PPT"`
+	HasChild     int                 `json:"-" description:"是否有子级别，0：下面没有子分类，1：下面有子分类；默认：0"` //`description:"是否有子级别，0：下面没有子分类，1：下面有子分类；默认：0"`
 	Children     []*ClassifyTreeItem `description:"子目录"`
 }
 

services/report_open.go

@@ -29,6 +29,18 @@ func GetReportClassifyTreeRecursive(list []*models.Classify, parentId int) []*mo
 	return res
 }
 
+func RecursiveFilterNoChildTreeClassify(list []*models.ClassifyTreeItem) []*models.ClassifyTreeItem {
+	res := make([]*models.ClassifyTreeItem, 0)
+	for _, v := range list {
+		v.Children = RecursiveFilterNoChildTreeClassify(v.Children)
+		if len(v.Children) == 0 && v.HasChild == 1 {
+			continue
+		}
+		res = append(res, v)
+	}
+	return res
+}
+
 // GetReportByOutReportId 根据外部ID获取报告
 func GetReportByOutReportId(outReportId int) (reportItem *models.Report, pptItem *models.PptV2) {
 	reportOb := new(models.Report)