no message

services/es_comprehensive.go

@@ -330,7 +330,7 @@ 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)
 		}
 	}
@@ -520,7 +520,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			industrialResourceIdstring = append(industrialResourceIdstring, strconv.Itoa(v))
 		}
 		industrialId := strings.Join(industrialResourceIdstring, ",")
-		condition = ` AND  m.industrial_management_id IN  (` + industrialId + `)  AND a.article_type = 0 `
+		condition = ` AND  m.industrial_management_id IN  (` + industrialId + `)  AND a.article_type_id = 0 `
 		listIndustrialResourceIds, e := models.GetSearchResourceList(condition)
 		if e != nil {
 			err = errors.New("GetSearchResourceList, Err: " + e.Error())
@@ -551,22 +551,23 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 	}
 
 	//产业资源包
-	if len(industrialResourceIdsHz) > 0 {
+	if len(industrialResourceIdsYx) > 0 {
 		pars = make([]interface{}, 0)
 
 		var industrialResourceIdstring []string
-		for _, v := range industrialResourceIdsHz {
+		for _, v := range industrialResourceIdsYx {
 			industrialResourceIdstring = append(industrialResourceIdstring, strconv.Itoa(v))
 		}
 		industrialId := strings.Join(industrialResourceIdstring, ",")
-		condition = ` AND  m.industrial_management_id IN  (` + industrialId + `)  AND a.article_type > 0 `
+		condition = ` AND  m.industrial_management_id IN  (` + industrialId + `)  AND a.article_type_id > 0 `
 		listIndustrialResourceIds, e := models.GetSearchResourceList(condition)
 		if e != nil {
 			err = errors.New("GetSearchResourceList, Err: " + e.Error())
 			return
 		}
-		conditionSubject := condition + ` AND 	m.industrial_management_id  IN (` + utils.GetOrmInReplace(len(industrialResourceIdsHz)) + `)`
-		pars = append(pars, industrialResourceIdsHz)
+		fmt.Println(listIndustrialResourceIds)
+		conditionSubject := condition + ` AND 	m.industrial_management_id  IN (` + utils.GetOrmInReplace(len(industrialResourceIdsYx)) + `)`
+		pars = append(pars, industrialResourceIdsYx)
 		listSubjcet, e := models.GetIndustrialSubjectAllByIndustrialId(pars, conditionSubject)
 		//合并产业关联的标的
 		if e != nil {