Merge branch 'fix_bug_2021-06-25-10-40' of hongze/hongze_cygx into master

models/company.go

@@ -43,7 +43,6 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
 			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
 			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 a.product_id=2
 			AND c.is_suspend=0
             AND b.is_report=1
 			AND c.status IN('正式','试用','永续')

models/seller.go

@@ -25,7 +25,8 @@ func GetSellerByCompanyId(companyId int) (item *AdminItem, err error) {
 	sql := ` SELECT b.*,c.open_id,c.user_id,a.company_name FROM company_product AS a
 			INNER JOIN admin AS b ON a.seller_id=b.admin_id
 			LEFT JOIN wx_user AS c ON b.mobile=c.mobile
-			WHERE a.company_id=? AND a.product_id=2 `
+			WHERE a.company_id=? `
+	//WHERE a.company_id=? AND a.product_id=2 `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
 }