Merge branch 'cygx_14.2' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

services/es_comprehensive.go

@@ -549,7 +549,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
 		}
 	}
-	fmt.Println(industrialResourceIdsHz)
+	//fmt.Println(industrialResourceIdsHz)
 	//产业资源包
 	if len(industrialResourceIdsHz) > 0 {
 		pars = make([]interface{}, 0)
@@ -587,14 +587,14 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			if v.TimeLineData == "" {
 				v.ListTimeLine = make([]models.TimeLineReportResp, 0)
 			} else {
-				fmt.Println(v.TimeLineData)
+
 				if err = json.Unmarshal([]byte(v.TimeLineData), &v.ListTimeLine); err != nil {
-					fmt.Println(err)
+
 					e = errors.New("Unmarshal, Err: " + e.Error())
-					return
+					//return
 				}
 			}
-			fmt.Println(v.ListTimeLine)
+			//fmt.Println(v.ListTimeLine)
 			v.Source = 1
 			v.UpdateTime = v.PublishDate
 			mapItems[fmt.Sprint("industrialsourceHz", v.IndustrialManagementId)].IndustrialResource = v
@@ -866,7 +866,7 @@ func SqlComprehensiveSearch(keyWord string, startSize, pageSize int) (result []*
 	}
 	activityIds = append(activityIds, "0")
 
-	conditionActivity := " AND IF   ( source IN('activity') , source_id IN (" + strings.Join(activityIds, ",") + ") != 31 ,1=1 )"
+	conditionActivity := " AND IF   ( source IN('activity') , source_id IN (" + strings.Join(activityIds, ",") + ")  ,1=1 )"
 	keyWord = "%" + keyWord + "%"
 	var conditionTitle string
 	var parsTitle []interface{}