|
@@ -67,7 +67,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ fmt.Println(productinteriorIds)
|
|
|
//处理文章
|
|
|
if len(articleIds) > 0 {
|
|
|
pars = make([]interface{}, 0)
|
|
@@ -104,6 +104,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
return
|
|
|
}
|
|
|
for _, v := range listrMeet {
|
|
|
+ v.Content, _ = GetReportContentTextSub(v.Content)
|
|
|
v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
|
|
|
mapItems[fmt.Sprint("meetingreviewchapt", v.Id)].Meetingreviewchapt = v
|
|
|
}
|
|
@@ -148,12 +149,13 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = ` AND art.status = 1 AND art.product_interior_id IN (` + utils.GetOrmInReplace(len(productinteriorIds)) + `)`
|
|
|
pars = append(pars, productinteriorIds)
|
|
|
- listProductInterior, e := models.GetCygxProductInteriorList(condition, pars, 0, len(researchsummaryIds))
|
|
|
+ listProductInterior, e := models.GetCygxProductInteriorList(condition, pars, 0, len(productinteriorIds))
|
|
|
if e != nil {
|
|
|
err = errors.New("GetCygxProductInteriorList, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
for _, v := range listProductInterior {
|
|
|
+ v.Body, _ = GetReportContentTextSub(v.Body)
|
|
|
v.PublishTime = utils.TimeRemoveHms2(v.PublishTime)
|
|
|
mapItems[fmt.Sprint("productinterior", v.ProductInteriorId)].ProductInterior = v
|
|
|
}
|