|
|
@@ -566,7 +566,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
|
|
|
for _, vList := range list {
|
|
|
for _, v := range mapItems {
|
|
|
//如果这些类型都为空，那么就不合并
|
|
|
- if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil {
|
|
|
+ if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil && v.YanxuanSpecialAuthor == nil {
|
|
|
continue
|
|
|
}
|
|
|
if v.SourceId == vList.SourceId && v.Source == vList.Source {
|
|
|
@@ -643,7 +643,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 {
|
|
|
//全部都是内容搜索
|
|
|
startSize = startSize - totalTitle
|
|
|
|
xingzai