瀏覽代碼

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

Roc 3 年之前
父節點
當前提交
4933317044
共有 2 個文件被更改,包括 9 次插入8 次删除
  1. 4 4
      models/company.go
  2. 5 4
      services/user_permission.go

+ 4 - 4
models/company.go

@@ -46,18 +46,18 @@ func GetCompanyInfoById(companyId int) (item *Company, err error) {
 
 func GetCompanyById(companyId 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=? `
-	_,err = o.Raw(sql, companyId).QueryRows(&item)
+	_, err = o.Raw(sql, companyId).QueryRows(&item)
 	return
 }
 
-func GetCompanyProductById(companyId,productId 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
 			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)
+	err = o.Raw(sql, companyId, productId).QueryRow(&item)
 	return
 }

+ 5 - 4
services/user_permission.go

@@ -45,6 +45,11 @@ func CheckUserPermission(userId int) (status int, err error) {
 			return status, err
 		}
 		for _, v := range companyProduct {
+			if v.IsSuspend > 0 {
+				status = 40002
+				err = errors.New("客户被暂停" + strconv.Itoa(userId))
+				break
+			}
 			if v.Status == utils.COMPANY_STATUS_FORMAL || //正式
 				v.Status == utils.COMPANY_STATUS_TRY_OUT || //试用
 				v.Status == utils.COMPANY_STATUS_FOREVER { //永续
@@ -54,10 +59,6 @@ func CheckUserPermission(userId int) (status int, err error) {
 				status = 40002
 				err = errors.New("非付费用户" + strconv.Itoa(userId))
 			}
-			if v.IsSuspend > 0 {
-				status = 40002
-				err = errors.New("客户被暂停" + strconv.Itoa(userId))
-			}
 		}
 
 	} else {