|
@@ -255,7 +255,7 @@ func (this *BaseHomeController) ListHomePublic() {
|
|
|
br.ErrMsg = "获取信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if userType == 1 && categoryinfo.PermissionName == "研选" {
|
|
|
+ if userType == 1 && strings.Contains(categoryinfo.PermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
|
resp.HaveResearch = false
|
|
|
resp.Paging = page
|
|
|
br.Ret = 200
|
|
@@ -267,14 +267,14 @@ func (this *BaseHomeController) ListHomePublic() {
|
|
|
page = paging.GetPaging(currentIndex, pageSize, total)
|
|
|
if categoryId != "" {
|
|
|
condition += ` AND category_id IN(` + categoryId + `)`
|
|
|
- condition += ` OR ( category_name LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 AND is_summary = 1 )`
|
|
|
+ condition += ` OR ( category_name LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%' AND publish_status = 1 AND is_summary = 1 )`
|
|
|
} else {
|
|
|
- condition += ` AND category_name LIKE '%` + categoryinfo.PermissionName + `%'`
|
|
|
+ condition += ` AND category_name LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
|
|
|
}
|
|
|
}
|
|
|
//永续客户无法查看研选分类的内容
|
|
|
if userType == 1 {
|
|
|
- condition += ` AND category_name NOT LIKE '%研选` + `%'`
|
|
|
+ condition += ` AND category_name NOT LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
|
|
|
}
|
|
|
total, err = models.GetHomeCount(condition, pars)
|
|
|
if err != nil {
|
|
@@ -289,7 +289,7 @@ func (this *BaseHomeController) ListHomePublic() {
|
|
|
br.Msg = "获取帖子数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- for k, _ := range list {
|
|
|
+ for k, v := range list {
|
|
|
item := list[k]
|
|
|
//如果文章一开始的内容是图片,优先展示第一张图片
|
|
|
imgurl, _ := services.FixArticleImgUrl(html.UnescapeString(list[k].Body))
|
|
@@ -299,9 +299,13 @@ func (this *BaseHomeController) ListHomePublic() {
|
|
|
list[k].BodyHtml = imgurl
|
|
|
}
|
|
|
list[k].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDateTimeNoSecond) //时间字符串格式转时间格式
|
|
|
- if strings.Contains(item.CategoryName, "研选") {
|
|
|
+ if strings.Contains(item.CategoryName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
|
list[k].IsResearch = true
|
|
|
}
|
|
|
+ if list[k].ArticleId < utils.SummaryArticleId {
|
|
|
+ list[k].HttpUrl = utils.StrategyPlatform + strconv.Itoa(v.ArticleId)
|
|
|
+ list[k].IsNeedJump = true
|
|
|
+ }
|
|
|
if item.Pv > 999 {
|
|
|
list[k].Pv = 999
|
|
|
}
|
|
@@ -448,7 +452,7 @@ func (this *HomeController) ListHomeArtAndChart() {
|
|
|
br.ErrMsg = "获取信息失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- if userType == 1 && categoryinfo.PermissionName == "研选" {
|
|
|
+ if userType == 1 && strings.Contains(categoryinfo.PermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
|
resp.HaveResearch = false
|
|
|
resp.Paging = page
|
|
|
br.Ret = 200
|
|
@@ -460,14 +464,14 @@ func (this *HomeController) ListHomeArtAndChart() {
|
|
|
page = paging.GetPaging(currentIndex, pageSize, total)
|
|
|
if categoryId != "" {
|
|
|
condition += ` AND category_id IN(` + categoryId + `)`
|
|
|
- condition += ` OR ( category_name LIKE '%研选` + `%' AND publish_status = 1 AND is_summary = 1 )`
|
|
|
+ condition += ` OR ( category_name LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%' AND publish_status = 1 AND is_summary = 1 )`
|
|
|
} else {
|
|
|
- condition += ` AND category_name LIKE '%研选` + `%'`
|
|
|
+ condition += ` AND category_name LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
|
|
|
}
|
|
|
}
|
|
|
//永续客户无法查看研选分类的内容
|
|
|
if userType == 1 {
|
|
|
- condition += ` AND category_name NOT LIKE '%研选` + `%'`
|
|
|
+ condition += ` AND category_name NOT LIKE '%` + utils.CHART_PERMISSION_NAME_YANXUAN + `%'`
|
|
|
}
|
|
|
total, err = models.GetHomeCount(condition, pars)
|
|
|
if err != nil {
|
|
@@ -518,7 +522,7 @@ func (this *HomeController) ListHomeArtAndChart() {
|
|
|
list[k].BodyHtml = imgurl
|
|
|
}
|
|
|
list[k].PublishDate = utils.StrTimeToTime(item.PublishDate).Format(utils.FormatDateTimeNoSecond) //时间字符串格式转时间格式
|
|
|
- if strings.Contains(item.CategoryName, "研选") {
|
|
|
+ if strings.Contains(item.CategoryName, utils.CHART_PERMISSION_NAME_YANXUAN) {
|
|
|
list[k].IsResearch = true
|
|
|
}
|
|
|
if item.Pv > 999 {
|