瀏覽代碼

no message

xingzai 5 月之前
父節點
當前提交
f34339713b
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      services/es_comprehensive.go

+ 2 - 2
services/es_comprehensive.go

@@ -715,7 +715,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.Activityvoice == nil && v.YanxuanSpecial == nil {
+			if v.Article == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.YanxuanSpecial == nil && v.YanxuanSpecialAuthor == nil {
 				continue
 			}
 			if v.SourceId == vList.SourceId && v.Source == vList.Source {
@@ -795,7 +795,7 @@ func SqlComprehensiveSearch(user *models.WxUserItem, keyWord string, startSize,
 			err = errors.New("GetResourceDataListCondition, Err: " + e.Error())
 			return
 		}
-	} else if totalTitle <= searchTotal-pageSize {
+	} else if totalTitle < searchTotal-pageSize {
 		fmt.Println("2")
 		//全部都是内容搜索
 		startSize = startSize - totalTitle