英文报告列表返回顶级分类

controllers/english_report/report.go

@@ -527,13 +527,9 @@ func (this *EnglishReportController) ListReport() {
 		br.ErrMsg = "获取分类名称失败, ERR:" + err.Error()
 		return
 	}
-	classifyNameMap := make(map[int]string)
+	classifyNameMap := make(map[int]*models.EnglishClassifyFullName)
 	for _, v := range nameList {
-		if v.RootId == 0 {
-			classifyNameMap[v.Id] = strings.Join([]string{v.ParentName, v.ClassifyName}, "/")
-		} else {
-			classifyNameMap[v.Id] = strings.Join([]string{v.RootName, v.ParentName, v.ClassifyName}, "/")
-		}
+		classifyNameMap[v.Id] = v
 	}
 	for _, item := range list {
 		if item.State == 2 {
@@ -578,7 +574,13 @@ func (this *EnglishReportController) ListReport() {
 
 		//处理分类名
 		if n, ok := classifyNameMap[item.ClassifyIdSecond]; ok {
-			item.FullClassifyName = n
+			if n.RootId == 0 {
+				item.FullClassifyName = strings.Join([]string{n.ParentName, n.ClassifyName}, "/")
+			} else {
+				item.FullClassifyName = strings.Join([]string{n.RootName, n.ParentName, n.ClassifyName}, "/")
+			}
+			item.ClassifyIdRoot = n.RootId
+			item.ClassifyNameRoot = n.RootName
 		}
 	}
 

models/english_report.go

@@ -260,6 +260,8 @@ type EnglishReportList struct {
 	AdminId            int       `description:"创建者账号"`
 	AdminRealName      string    `description:"创建者姓名"`
 	FullClassifyName   string    `description:"顶级分类名/父级分类名/当前分类名"`
+	ClassifyIdRoot     int       `description:"顶级分类id"`
+	ClassifyNameRoot   string    `description:"顶级分类名称"`
 }
 
 type EnglishReportListResp struct {