主题详情列表修改

controllers/research.go

@@ -305,6 +305,7 @@ func (this *ResearchController) ThemeDetail() {
 		if subjectMap[v.SubjectName] == "" && v.SubjectName != "" {
 			resp.ListSubject = append(resp.ListSubject, itemSubJect)
 		}
+
 		subjectMap[v.SubjectName] = v.IndustryName
 		if v.FllowNum > 0 {
 			resp.IsFollw = true
@@ -331,6 +332,7 @@ func (this *ResearchController) ThemeDetail() {
 				item.Title = v2.Title
 				item.PublishDate = v2.PublishDate
 				item.SubjectName = v2.SubjectName
+				item.IndustrialSubjectId = v2.IndustrialSubjectId
 				for _, v3 := range list {
 					if v3.ArticleId == v2.ArticleId && v3.SubjectName != v2.SubjectName && v3.SubjectName != "" {
 						item.SubjectName += "/" + v3.SubjectName
@@ -343,20 +345,19 @@ func (this *ResearchController) ThemeDetail() {
 				if v2.MyCollectNum > 0 {
 					item.IsCollect = true
 				}
-				subjetcGroup.List = append(subjetcGroup.List, item)
+				resp.List = append(resp.List, item)
+				//subjetcGroup.List = append(subjetcGroup.List, item)
 			}
 			subjetcGroup.SubjectName = v.SubjectName
 		}
-		resp.List = append(resp.List, subjetcGroup)
+
 	}
 	//当标的为空时进行合并
 	if len(itemsNull) > 0 {
-		subjetcGroup := new(models.GetThemeAericleListBuSubjectResp)
 		for _, v := range itemsNull {
-			subjetcGroup.List = append(subjetcGroup.List, v)
-			subjetcGroup.SubjectName = v.SubjectName
+			resp.List = append(resp.List, v)
 		}
-		resp.List = append(resp.List, subjetcGroup)
+
 	}
 	br.Ret = 200
 	br.Success = true

models/report.go

@@ -507,17 +507,18 @@ type GetThemeDetailListResp struct {
 }
 
 type GetThemeAericleListResp struct {
-	ArticleId    int    `description:"文章id"`
-	Title        string `description:"标题"`
-	PublishDate  string `description:"发布时间"`
-	SubjectName  string `description:"标的名称"`
-	DepartmentId int    `description:"作者Id"`
-	NickName     string `description:"作者昵称"`
-	Pv           int    `description:"PV"`
-	CollectNum   int    `description:"收藏人数"`
-	FllowNum     int    `description:"关注数量"`
-	MyCollectNum int    `description:"本人是否收藏"`
-	IsCollect    bool   `description:"本人是否收藏"`
+	ArticleId           int    `description:"文章id"`
+	Title               string `description:"标题"`
+	PublishDate         string `description:"发布时间"`
+	SubjectName         string `description:"标的名称"`
+	IndustrialSubjectId int    `description:"标的ID"`
+	DepartmentId        int    `description:"作者Id"`
+	NickName            string `description:"作者昵称"`
+	Pv                  int    `description:"PV"`
+	CollectNum          int    `description:"收藏人数"`
+	FllowNum            int    `description:"关注数量"`
+	MyCollectNum        int    `description:"本人是否收藏"`
+	IsCollect           bool   `description:"本人是否收藏"`
 }
 
 type GetThemeAericleListBuSubjectResp struct {
@@ -531,7 +532,7 @@ type GetThemeDetailResp struct {
 	IndustryName           string               `description:"产业名称"`
 	IsFollw                bool                 `description:"是否关注"`
 	ListSubject            []*IndustrialSubject `description:"标的列表"`
-	List                   []*GetThemeAericleListBuSubjectResp
+	List                   []*GetThemeAericleListResp
 }
 
 //列表