Browse Source

处理研选报告关联多个产业的时候,作者详情回显展示bug处理

xingzai 2 years ago
parent
commit
1415231438
2 changed files with 17 additions and 3 deletions
  1. 16 0
      controllers/research.go
  2. 1 3
      models/report.go

+ 16 - 0
controllers/research.go

@@ -540,10 +540,26 @@ func (this *ResearchController) DepartmentIdDetail() {
 		br.ErrMsg = "获取文章列表失败,Err:" + err.Error()
 		return
 	}
+	var articleIds []int
 	for k, v := range list {
 		if v.MyCollectNum > 0 {
 			list[k].IsCollect = true
 		}
+		articleIds = append(articleIds, v.ArticleId)
+	}
+	//处理关联的产业
+	industrialMap, err := services.GetArticleIndustrialByArticleId(articleIds)
+	if err != nil {
+		br.Msg = "获取信息失败"
+		br.ErrMsg = "获取关联的产业信息失败,GetArticleIndustrialByArticleId Err:" + err.Error()
+		return
+	}
+	for k, v := range list {
+		if len(industrialMap[v.ArticleId]) > 0 {
+			list[k].List = industrialMap[v.ArticleId]
+		} else {
+			list[k].List = make([]*models.IndustrialManagementResp, 0)
+		}
 	}
 
 	condition = ` AND a.department_id =  ` + strconv.Itoa(departmentId)

+ 1 - 3
models/report.go

@@ -682,9 +682,7 @@ func GetIndustrialDepartmentList() (items []*IndustrialDepartmentListResp, err e
 		WHERE
 			1 = 1
 			AND a.article_type_id > 0
-			AND publish_status = 1 
-		GROUP BY
-			a.article_id 
+			AND publish_status = 1
 		ORDER BY
 			a.publish_date DESC`
 	_, err = o.Raw(sql).QueryRows(&items)