瀏覽代碼

no message

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

+ 2 - 1
services/es_comprehensive.go

@@ -1166,7 +1166,8 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 
 	for _, vList := range list {
 		for _, v := range mapItems {
-			if mapItems["Article"] == nil && mapItems["Newchart"] == nil && mapItems["Roadshow"] == nil && mapItems["Activity"] == nil && mapItems["Activityvideo"] == nil && mapItems["Activityvoice"] == nil && mapItems["Activityspecial"] == nil && mapItems["Researchsummary"] == nil && mapItems["Minutessummary"] == nil && mapItems["Meetingreviewchapt"] == nil && mapItems["ProductInterior"] == nil && mapItems["IndustrialResource"] == nil {
+			//如果这些类型都为空,那么就不合并
+			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil {
 				continue
 			}
 			if v.SourceId == vList.SourceId {