no message

services/es_comprehensive.go

@@ -469,7 +469,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 	for _, vList := range list {
 		for _, v := range mapItems {
 			//如果这些类型都为空，那么就不合并
-			if v.Article == nil && v.Activity == nil && v.Activityvideo == nil && v.YanxuanSpecial == nil && v.YanxuanSpecialAuthor == nil {
+			if v.Article == nil && v.Activity == nil && v.YanxuanSpecial == nil && v.YanxuanSpecialAuthor == nil {
 				continue
 			}
 			if v.SourceId == vList.SourceId && v.Source == vList.Source {
@@ -521,10 +521,10 @@ func SqlComprehensiveSearch(user *models.WxUserItem, keyWord string, startSize,
 	totalTitle, e := models.GetResourceDataAndYanxuanSpecialAuthorCount(conditionTitle, parsTitle, conditionContentYxAuthor, parsContentYxAuthor)
 
 	//totalTitle, e := models.GetResourceDataCount(conditionTitle, parsTitle)
-	//if e != nil {
-	//	err = errors.New("GetResourceDataCount, Err: " + e.Error())
-	//	return
-	//}
+	if e != nil {
+		err = errors.New("GetResourceDataAndYanxuanSpecialAuthorCount, Err: " + e.Error())
+		return
+	}
 
 	var conditionContent string
 	var parsContent []interface{}