|
|
@@ -727,7 +727,7 @@ func (this *ResearchController) ArticleNewList() {
|
|
|
var conditiontype string
|
|
|
var pars []interface{}
|
|
|
condition = ` AND publish_status = 1 `
|
|
|
- if articleTypeIds == "" || strings.Contains(articleTypeIds,"999") {
|
|
|
+ if articleTypeIds == "" || strings.Contains(articleTypeIds, "999") {
|
|
|
conditiontype = " AND is_show_yanx = 1 "
|
|
|
} else {
|
|
|
conditiontype = ` AND group_id IN (` + articleTypeIds + `) `
|
|
|
@@ -754,7 +754,6 @@ func (this *ResearchController) ArticleNewList() {
|
|
|
articleTypeIds = strings.TrimRight(articleTypeIds, ",")
|
|
|
condition += ` AND a.article_type_id IN (` + articleTypeIds + `) `
|
|
|
|
|
|
-
|
|
|
total, err := models.GetArticleResearchCount(condition, pars, needYanxuanSpecial)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取信息失败"
|
|
|
@@ -831,6 +830,7 @@ func (this *ResearchController) ArticleNewList() {
|
|
|
}
|
|
|
v.SpecialTags += v.IndustryTags
|
|
|
}
|
|
|
+ item.SpecialTags = v.SpecialTags
|
|
|
resp.List = append(resp.List, &item)
|
|
|
}
|
|
|
resp.Paging = page
|
xingzai