no message

controllers/home.go

@@ -9,6 +9,7 @@ import (
 	"html"
 	"strconv"
 	"strings"
+	"time"
 )
 
 type HomeController struct {
@@ -687,10 +688,13 @@ func (this *HomeController) NewList() {
 
 	//condition += " AND source = 'article' "
 	//查询近一个月的数据
+	conditionInit = " AND publish_date  >   '" + time.Now().AddDate(0, 0, -30).Format(utils.FormatDateTime) + "'"
 	if user.CompanyId <= 1 {
-		condition += " AND source IN ('roadshow','article') "
-		startSize = 0
-		pageSize = 4
+		condition += " AND source IN ('roadshow','article','activityvideo','activityvoice') "
+		if user.Mobile == "" && user.Email == "" {
+			startSize = 0
+			pageSize = 4
+		}
 	} else {
 		condition += ` AND source NOT IN ('activity','activityspecial','newchart') ` + conditionInit
 		conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0)
@@ -737,6 +741,8 @@ func (this *HomeController) NewList() {
 			pars = append(pars, activityspecialIds)
 		}
 	}
+	//condition = " AND source_id = 1000523    "
+	pars = make([]interface{}, 0)
 	total, err := models.GetResourceDataCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -744,7 +750,7 @@ func (this *HomeController) NewList() {
 		return
 	}
 
-	if user.CompanyId <= 1 {
+	if user.Mobile == "" && user.Email == "" {
 		total = pageSize
 	}
 

services/article.go

@@ -1865,7 +1865,7 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 //解析研选内容中的核心观点
 func YxArticleAnnotation(article *models.HomeArticle) (annotation string) {
 	//如果不规范，就获取内容主体
-	if strings.Count("<hr", article.Body) == 0 {
+	if strings.Count(article.Body, "<hr") == 0 {
 		annotation, _ = GetReportContentTextSub(article.Body)
 		return
 	}