Merge branch 'cygx_4.1' of hongze/hongze_cygx into master

models/company.go

@@ -40,7 +40,7 @@ func GetCompanyDetailByIdGroup(companyId int) (item *CompanyDetail, err error) {
 			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
 			WHERE a.company_id=? AND b.product_id = 2 
 			OR (a.company_id = ? AND  cp.permission_name = '策略' ) 
-			GROUP BY b.company_id `
+			ORDER BY b.product_id DESC  LIMIT 0,1 `
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return

models/report.go

@@ -94,6 +94,7 @@ func IndustrialToArticleCategory(industrialManagementId int) (items []*Industria
 	INNER JOIN cygx_industrial_article_group_management AS man_g ON man_g.article_id = art.article_id
 	WHERE map.report_type = 2 
     AND art.is_report = 1
+    AND art.publish_status = 1
 	AND man_g.industrial_management_id =?
 	GROUP BY map.match_type_name`
 	_, err = o.Raw(sql, industrialManagementId).QueryRows(&items)