Merge branch 'crm/crm_16.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/company/company_permission.go

@@ -452,7 +452,7 @@ func GetChartPermissionListByIds(chartPermissionIds []int) (list []*ChartPermiss
 // 根据企业用户id和产品id获取所有正式的权限
 func GetCompanyProductReportPermissionList(companyId, productId int) (items []*CompanyReportPermissionAndName, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT a.*,b.permission_name,b.classify_name FROM company_report_permission a left join chart_permission b on a.chart_permission_id=b.chart_permission_id WHERE a.company_id = ? and a.product_id=? `
+	sql := `SELECT a.*,b.permission_name,b.classify_name FROM company_report_permission a left join chart_permission b on a.chart_permission_id=b.chart_permission_id WHERE a.company_id = ? and a.product_id=?  AND a.status IN ('正式','试用','永续')  `
 	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
 	return
 }