瀏覽代碼

fix(报告权限):如果客户被暂停了,那么返回没有权限

Roc 3 年之前
父節點
當前提交
7751f88647
共有 3 個文件被更改,包括 8 次插入4 次删除
  1. 5 0
      controllers/report.go
  2. 1 1
      models/company.go
  3. 2 3
      models/company_product.go

+ 5 - 0
controllers/report.go

@@ -174,6 +174,11 @@ func (this *ReportController) Detail() {
 		}
 	}
 
+	//如果客户产品被禁用了,那么没有权限
+	if company != nil && company.IsSuspend > 0 {
+		status = 2
+		msg = "您还未开通权限,如有需要请联系对口销售"
+	}
 	if status == 2 {
 		report.Content = report.ContentSub
 		report.VideoUrl = ""

+ 1 - 1
models/company.go

@@ -55,7 +55,7 @@ func GetCompanyById(companyId int) (item []*CompanyProduct, err error) {
 
 func GetCompanyProductById(companyId, productId int) (item *CompanyProduct, err error) {
 	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.status FROM company AS a
+	sql := ` SELECT a.*,b.status,b.is_suspend FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
 			WHERE a.company_id=? AND b.product_id=? `
 	err = o.Raw(sql, companyId, productId).QueryRow(&item)

+ 2 - 3
models/company_product.go

@@ -40,14 +40,13 @@ func GetCompanyProductPermissionCount(companyId, productId int) (count int, err
 				INNER JOIN company_product AS b ON a.company_id=b.company_id 
 				INNER JOIN company_report_permission AS c ON a.company_id=c.company_id
 				WHERE  b.company_id=? AND b.product_id=?
-				AND b.status IN('正式','试用')
+				AND b.status IN('正式','试用','永续')
 				AND c.product_id=? `
 	o := orm.NewOrm()
 	err = o.Raw(sql, companyId, productId, productId).QueryRow(&count)
 	return
 }
 
-
 type CompanyProductDetail struct {
 	CompanyProductId int       `orm:"column(company_product_id);pk" description:"客户产品id"`
 	CompanyId        int       `description:"客户id"`
@@ -83,4 +82,4 @@ func GetCompanyProductsByUserId(userId int) (items []*CompanyProductDetail, err
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, userId).QueryRows(&items)
 	return
-}
+}