no message

controllers/report.go

@@ -2237,13 +2237,12 @@ func (this *ReportController) SearchReport() {
 	}
 	keyWord := this.GetString("KeyWord")
 	var condition string
-	//匹配报告标题、对应产业名称、标的名称。
-	condition = `AND (
-	    a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%'
-	    OR a.article_id IN ( SELECT article_id FROM cygx_industrial_article_group_subject WHERE industrial_subject_id IN ( SELECT industrial_subject_id FROM cygx_industrial_subject WHERE subject_name LIKE '%` + keyWord + `%' ) ) 
-	    OR a.article_id IN ( SELECT article_id FROM cygx_industrial_article_group_management WHERE industrial_management_id IN ( SELECT industrial_management_id FROM cygx_industrial_management WHERE industry_name LIKE '%` + keyWord + `%' ) ) 
-	)
+	//匹配报告标题、
+	condition = `AND ( a.title LIKE '%` + keyWord + `%' OR  a.body LIKE '%` + keyWord + `%')
 	GROUP BY  a.article_id  ORDER BY a.publish_date DESC  `
+	//对应产业名称、标的名称。
+	//OR a.article_id IN ( SELECT article_id FROM cygx_industrial_article_group_subject WHERE industrial_subject_id IN ( SELECT industrial_subject_id FROM cygx_industrial_subject WHERE subject_name LIKE '%` + keyWord + `%' ) )
+	//OR a.article_id IN ( SELECT article_id FROM cygx_industrial_article_group_management WHERE industrial_management_id IN ( SELECT industrial_management_id FROM cygx_industrial_management WHERE industry_name LIKE '%` + keyWord + `%' ) )
 	listYx, err := models.GetArticleCollectionList(` AND a.article_id >= 1000000 `+condition, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"
@@ -2276,6 +2275,12 @@ func (this *ReportController) SearchReport() {
 		keyWordItem.CreateTime = time.Now()
 		go models.AddUserSearchKeyWord(keyWordItem)
 	}
+	if len(listYx) == 0 {
+		listYx = make([]*models.ArticleCollectionResp, 0)
+	}
+	if len(listHz) == 0 {
+		listHz = make([]*models.ArticleCollectionResp, 0)
+	}
 	resp := new(models.ReoprtSearchResp)
 	resp.ListYx = listYx
 	resp.ListHz = listHz
@@ -2305,8 +2310,8 @@ func (this *ReportController) SearchResource() {
 	keyWord := this.GetString("KeyWord")
 	var condition string
 	var conditionOr string
-	conditionOr = ` OR ( a.title LIKE '%` + keyWord + `%' AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
-	conditionOr += ` OR ( a.body LIKE '%` + keyWord + `%' AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
+	//conditionOr = ` OR ( a.title LIKE '%` + keyWord + `%' AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
+	conditionOr += ` OR ( m.subject_names LIKE '%` + keyWord + `%' AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
 	condition = ` AND m.industry_name LIKE '%` + keyWord + `%' AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId) + conditionOr
 
 	listHz, err := models.GetSearchResourceList(condition)
@@ -2315,8 +2320,8 @@ func (this *ReportController) SearchResource() {
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	conditionOr = ` OR ( a.title LIKE '%` + keyWord + `%' AND a.article_id >= ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
-	conditionOr += ` OR ( a.body LIKE '%` + keyWord + `%' AND a.article_id >= ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
+	//conditionOr = ` OR ( a.title LIKE '%` + keyWord + `%' AND a.article_id >= ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
+	conditionOr = ` OR ( m.subject_names LIKE '%` + keyWord + `%' AND a.article_id >= ` + strconv.Itoa(utils.SummaryArticleId) + `  AND publish_status = 1 ) `
 	condition = ` AND m.industry_name LIKE '%` + keyWord + `%' AND a.article_id >= ` + strconv.Itoa(utils.SummaryArticleId) + conditionOr
 
 	listYx, err := models.GetSearchResourceList(condition)
@@ -2357,6 +2362,12 @@ func (this *ReportController) SearchResource() {
 		go models.AddUserSearchKeyWord(keyWordItem)
 	}
 	resp := new(models.SearchResourceResp)
+	if len(listYx) == 0 {
+		listYx = make([]*models.IndustrialManagementHotResp, 0)
+	}
+	if len(listHz) == 0 {
+		listHz = make([]*models.IndustrialManagementHotResp, 0)
+	}
 	resp.ListYx = listYx
 	resp.ListHz = listHz
 	br.Ret = 200