Merge branch 'cygx_10.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/es_comprehensive.go

@@ -929,11 +929,11 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			productinteriorIds = append(productinteriorIds, v.SourceId)
 		} else if v.Source == "industrialsourceHz" {
 			industrialResourceIdsHz = append(industrialResourceIdsHz, v.SourceId)
-		} else if v.Source == "industrialResourceIdsYx" {
+		} else if v.Source == "industrialsourceYx" {
 			industrialResourceIdsYx = append(industrialResourceIdsYx, v.SourceId)
 		}
-
 	}
+	fmt.Println(industrialResourceIdsYx)
 	//处理文章
 	if len(articleIds) > 0 {
 		pars = make([]interface{}, 0)

services/keyword.go

@@ -96,6 +96,9 @@ func SearchKeywordUserRmind(user *models.WxUserItem, keyWord string) (err error)
 			err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 			return
 		}
+		if len(openIdList) == 0 {
+			return
+		}
 		first = fmt.Sprint("互动：搜索,", user.RealName, "--", user.CompanyName)
 		keyword1 = "搜索关键词：" + keyWord
 		keyword2 = first