|
@@ -425,14 +425,15 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
if lenreportselectionIds > 0 {
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = ` AND article_id IN (` + utils.GetOrmInReplace(lenreportselectionIds) + `)`
|
|
|
- pars = append(pars, lenreportselectionIds)
|
|
|
-
|
|
|
- listreportselection, e := models.GetReportSelectionList(condition, pars, startSize, pageSize)
|
|
|
+ pars = append(pars, reportselectionIds)
|
|
|
+ listreportselection, e := models.GetReportSelectionList(condition, pars, 0, lenreportselectionIds)
|
|
|
if e != nil {
|
|
|
err = errors.New("GetReportSelectionList, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
for _, v := range listreportselection {
|
|
|
+ v.Title += "(第" + v.Periods + "期)"
|
|
|
+ v.MarketStrategy = AnnotationHtml(v.MarketStrategy)
|
|
|
v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
|
|
|
mapItems[fmt.Sprint("reportselection", v.ArticleId)].ReportSelection = v
|
|
|
}
|