Merge branch 'cygx/7.4' into debug

models/industrial_management.go

@@ -172,15 +172,23 @@ func GetIndustrialManagementDetail(industrialManagementId int) (items *Industria
 func GetIndustrialNewArticleDetail(industrialManagementId int) (item *ArticleDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-	* 
-FROM
-	cygx_article 
-WHERE
-	article_id IN ( SELECT article_id FROM cygx_industrial_article_group_management WHERE industrial_management_id = ? )
-ORDER BY
-	is_report DESC,
-	publish_date DESC 
-	LIMIT 0,1`
+				*
+			FROM
+				cygx_article
+			WHERE
+				article_id IN (
+					SELECT
+						article_id
+					FROM
+						cygx_industrial_article_group_management
+					WHERE
+						industrial_management_id = ?
+				)
+			AND is_class = 1 AND is_report = 1
+			ORDER BY
+				is_report DESC,
+				publish_date DESC
+			LIMIT 0,1`
 	err = o.Raw(sql, industrialManagementId).QueryRow(&item)
 	return
 }