Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_v2

controllers/article.go

@@ -216,7 +216,7 @@ func (this *ArticleController) Detail() {
 			br.ErrMsg = "获取销售数据失败，Err:" + err.Error() + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(articleId)
 			return
 		}
-		if detail.ArticleId > 1000000 {
+		if detail.ArticleId >= 1000000 {
 			var hrefRegexp = regexp.MustCompile("[0-9]\\d*")
 			match := hrefRegexp.FindAllString(detail.SellerAndMobile, -1)
 			if match != nil {

models/company.go

@@ -44,7 +44,7 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id
 			WHERE  a.company_id=?
 			AND c.is_suspend=0
-            AND b.is_report=1
+            AND b.cygx_auth=1
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续') `
 	o := orm.NewOrm()