弘则产业资源包添加文章标题，内容的搜索

controllers/report.go

@@ -2239,7 +2239,7 @@ func (this *ReportController) SearchReport() {
 	var condition string
 	//匹配报告标题、对应产业名称、标的名称。
 	condition = `AND (
-	    a.title LIKE '%` + keyWord + `%'
+	    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 + `%' ) ) 
 	)
@@ -2302,14 +2302,21 @@ func (this *ReportController) SearchResource() {
 	}
 	keyWord := this.GetString("KeyWord")
 	var condition string
-	condition = `AND m.industry_name LIKE '%` + keyWord + `%' AND m.chart_permission_id != 31 GROUP BY m.industrial_management_id `
+	var conditionOr string
+	conditionOr = `OR ( a.title LIKE '%` + keyWord + `%' AND m.chart_permission_id != 31 AND publish_status = 1 ) `
+	conditionOr += `OR ( a.body LIKE '%` + keyWord + `%' AND m.chart_permission_id != 31 AND publish_status = 1 ) `
+	condition = conditionOr + `AND m.industry_name LIKE '%` + keyWord + `%' AND m.chart_permission_id != 31 GROUP BY m.industrial_management_id `
+
 	listHz, err := models.GetSearchResourceList(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + err.Error()
 		return
 	}
-	condition = `AND m.industry_name LIKE '%` + keyWord + `%' AND m.chart_permission_id = 31 GROUP BY m.industrial_management_id `
+	conditionOr = `OR ( a.title LIKE '%` + keyWord + `%' AND m.chart_permission_id = 31 AND publish_status = 1 ) `
+	conditionOr += `OR ( a.body LIKE '%` + keyWord + `%' AND m.chart_permission_id = 31 AND publish_status = 1 ) `
+	condition = conditionOr + `AND m.industry_name LIKE '%` + keyWord + `%' AND m.chart_permission_id = 31 GROUP BY m.industrial_management_id `
+
 	listYx, err := models.GetSearchResourceList(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"

models/report.go

@@ -449,7 +449,7 @@ func GetDepartmentList(permissionName string, userId int) (items []*DepartmentRe
 			d.department_id,
 			d.img_url,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id  AND user_id =?  AND f.type= 1  ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article_department_follow AS f WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id) AS sum_num
+			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f INNER JOIN wx_user AS u ON u.user_id = f.user_id  WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user AS u ON u.user_id = ac.user_id  WHERE ac.article_id = a.article_id) AS sum_num
 		FROM
 		cygx_article_department AS d
 			INNER JOIN cygx_article AS a ON d.department_id = a.department_id