|
@@ -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)
|