|
@@ -102,6 +102,7 @@ func (this *MobileResearchController) ArticleNewList() {
|
|
|
br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ articleTypeIds = ""
|
|
|
for _, v := range listType {
|
|
|
articleTypeIds += strconv.Itoa(v.ArticleTypeId) + ","
|
|
|
}
|
|
@@ -318,14 +319,14 @@ func (this *MobileResearchController) HotList() {
|
|
|
br.ErrMsg = "GetYanXuanIndustrialManagementIdNewMap,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if themeType == 2 {
|
|
|
- mapHot, err = services.GetYanXuanIndustrialManagementIdHotMap(articleTypeIds)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取信息失败"
|
|
|
- br.ErrMsg = "GetYanXuanIndustrialManagementIdNewMap,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
+ //if themeType == 2 {
|
|
|
+ mapHot, err = services.GetYanXuanIndustrialManagementIdHotMap(articleTypeIds)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "GetYanXuanIndustrialManagementIdNewMap,Err:" + err.Error()
|
|
|
+ return
|
|
|
}
|
|
|
+ //}
|
|
|
for k, v := range list {
|
|
|
list[k].IsNew = mapNew[v.IndustrialManagementId]
|
|
|
list[k].IsHot = mapHot[v.IndustrialManagementId]
|
|
@@ -545,7 +546,6 @@ func (this *MobileResearchController) DepartmentIdDetail() {
|
|
|
}
|
|
|
|
|
|
condition = ` AND a.department_id = ` + strconv.Itoa(departmentId)
|
|
|
- condition += ` AND a.article_type_id IN (` + articleTypeIds + `) `
|
|
|
total, err := models.GetArticleResearchCount(condition, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|