|
@@ -852,8 +852,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
} else {
|
|
|
v.BodyHighlight = make([]string, 0)
|
|
|
}
|
|
|
- v.Title = mapItems[fmt.Sprint("article", v.ArticleId)].Article.Title
|
|
|
- v.BodyHighlight = mapItems[fmt.Sprint("article", v.ArticleId)].Article.BodyHighlight
|
|
|
mapItems[fmt.Sprint("article", v.ArticleId)].Article = v
|
|
|
}
|
|
|
}
|
|
@@ -889,7 +887,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
}
|
|
|
for _, v := range listresearchsummary {
|
|
|
v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
|
|
|
- v.Title = mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Article.Title
|
|
|
mapItems[fmt.Sprint("minutessummary", v.ArticleId)].Minutessummary = v
|
|
|
}
|
|
|
}
|
|
@@ -907,7 +904,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
}
|
|
|
for _, v := range listresearchsummary {
|
|
|
v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
|
|
|
- v.Title = mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Article.Title
|
|
|
mapItems[fmt.Sprint("researchsummary", v.ArticleId)].Researchsummary = v
|
|
|
}
|
|
|
}
|
|
@@ -925,7 +921,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
for _, v := range listProductInterior {
|
|
|
v.Body = ProductInteriorHtml(v.Body)
|
|
|
v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
|
|
|
- v.Title = mapItems[fmt.Sprint("productinterior", v.ProductInteriorId)].Article.Title
|
|
|
mapItems[fmt.Sprint("productinterior", v.ProductInteriorId)].ProductInterior = v
|
|
|
}
|
|
|
}
|
|
@@ -970,7 +965,6 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
}
|
|
|
v.ImgUrl = imgUrlResp
|
|
|
v.SourceType = mapActivitySignup[v.ActivityId]
|
|
|
- v.ActivityName = mapItems[fmt.Sprint("activity", v.ActivityId)].Article.Title
|
|
|
mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
|
|
|
}
|
|
|
}
|
|
@@ -1007,7 +1001,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- listIndustrialResourceIds, _ = HandleIndustryList(listIndustrialResourceIds, user, "Hz")
|
|
|
+ //listIndustrialResourceIds, _ = HandleIndustryList(listIndustrialResourceIds, user, "Hz")
|
|
|
for _, v := range listIndustrialResourceIds {
|
|
|
mapItems[fmt.Sprint("industrialsource", v.IndustrialManagementId)].IndustrialResource = v
|
|
|
}
|
|
@@ -1202,6 +1196,12 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
if v.SourceId == vList.SourceId {
|
|
|
items = append(items, v)
|
|
|
}
|
|
|
+ if v.Newchart != nil {
|
|
|
+ v.Newchart.Title = vList.Title
|
|
|
+ }
|
|
|
+ if v.Activity != nil {
|
|
|
+ v.Activity.ActivityName = vList.Title
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return
|