Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_4.3

models/report.go

@@ -276,9 +276,9 @@ func GetCygxIndustryAndArticleList(keyWord string) (items []*CygxIndustryAndArti
 			art.publish_date
 		FROM
 			cygx_article AS art
-			INNER JOIN cygx_industrial_article_group_subject AS sg ON sg.article_id = art.article_id
-			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = mg.article_id
-			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
+			LEFT JOIN cygx_industrial_article_group_subject AS sg ON sg.article_id = art.article_id
+			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = mg.article_id
+			LEFT JOIN cygx_industrial_management AS m ON m.industrial_management_id = mg.industrial_management_id 
 		WHERE
 		category_name LIKE '%研选%'
 		AND art.article_id IN ( SELECT article_id FROM cygx_industrial_article_group_subject AS sg WHERE sg.industrial_subject_id IN ( SELECT industrial_subject_id FROM cygx_industrial_subject WHERE subject_name LIKE '%` + keyWord + `%' ) GROUP BY sg.article_id )