|
@@ -473,41 +473,19 @@ func (this *ReportController) List() {
|
|
|
imgUrlChartPermission = vslice[len(vslice)-1]
|
|
|
mapChartPermission[permissionName] = imgUrlChartPermission
|
|
|
}
|
|
|
- var condition string
|
|
|
- //var pars []interface{}
|
|
|
- //
|
|
|
- if detail.PolymerizationId != "" {
|
|
|
- condition = ` AND category_id IN(` + detail.PolymerizationId + `)`
|
|
|
- } else {
|
|
|
- condition = ` AND category_id IN(` + strconv.Itoa(categoryId) + `)`
|
|
|
- }
|
|
|
-
|
|
|
- total, err = models.GetHomeCount(condition, pars)
|
|
|
+ total, err = models.GetReportIndustrialCount(categoryId, industrialManagementId)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
- br.Msg = "获取帖子总数失败,Err:" + err.Error()
|
|
|
+ br.ErrMsg = "获取帖子总数失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- list, err := models.GetHomeList(condition, pars, startSize, pageSize)
|
|
|
+ page = paging.GetPaging(currentIndex, pageSize, total)
|
|
|
+ list, err := models.GetReportIndustrialList(pars, categoryId, industrialManagementId, uid, startSize, pageSize)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
- br.Msg = "获取帖子数据失败,Err:" + err.Error()
|
|
|
+ br.ErrMsg = "获取帖子数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- //total, err = models.GetReportIndustrialCount(categoryId, industrialManagementId)
|
|
|
- //if err != nil {
|
|
|
- // br.Msg = "获取信息失败"
|
|
|
- // br.ErrMsg = "获取帖子总数失败,Err:" + err.Error()
|
|
|
- // return
|
|
|
- //}
|
|
|
- page = paging.GetPaging(currentIndex, pageSize, total)
|
|
|
- //list, err := models.GetReportIndustrialList(pars, categoryId, industrialManagementId, uid, startSize, pageSize)
|
|
|
- //if err != nil {
|
|
|
- // br.Msg = "获取信息失败"
|
|
|
- // br.ErrMsg = "获取帖子数据失败,Err:" + err.Error()
|
|
|
- // return
|
|
|
- //}
|
|
|
//对应分类的所图片
|
|
|
detailCategoryUrl, err := models.GetConfigByCode("category_map_img_url")
|
|
|
if err != nil {
|