策略权限

controllers/activity.go

@@ -556,7 +556,7 @@ func (this *ActivityCoAntroller) Detail() {
 			br.ErrMsg = "获取客户权限信息失败,Err:" + err.Error()
 			return
 		}
-		companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
+		companyItem, err := models.GetCompanyDetailById(user.CompanyId)
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
@@ -766,7 +766,7 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
-		companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
+		companyItem, err := models.GetCompanyDetailById(user.CompanyId)
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
@@ -1366,7 +1366,7 @@ func (this *ActivityCoAntroller) MeetingReminderAdd() {
 			br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
 			return
 		}
-		companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
+		companyItem, err := models.GetCompanyDetailById(user.CompanyId)
 		//冻结客户
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {

controllers/user.go

@@ -365,7 +365,7 @@ func (this *UserController) Detail() {
 			}
 		}
 		if user.CompanyId > 1 {
-			companyItem, err := models.GetCompanyDetailAllById(user.CompanyId)
+			companyItem, err := models.GetCompanyDetailById(user.CompanyId)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取信息失败"
 				br.ErrMsg = "获取客户信息失败,Err:" + err.Error()

models/company.go

@@ -12,13 +12,22 @@ type CompanyDetail struct {
 }
 
 func GetCompanyDetailById(companyId int) (item *CompanyDetail, err error) {
+	//sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile
+	//        FROM company AS a
+	//		INNER JOIN company_product AS b ON a.company_id=b.company_id
+	//		LEFT JOIN admin AS c ON b.seller_id=c.admin_id
+	//		WHERE a.company_id=? AND  b.product_id=2 `
+
 	sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile 
             FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
+			INNER JOIN company_report_permission AS p ON p.company_id = a.company_id
+			INNER JOIN chart_permission AS cp ON cp.chart_permission_id=p.chart_permission_id
 			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
-			WHERE a.company_id=? AND  b.product_id=2 `
+			WHERE a.company_id=? AND cp.cygx_auth=1
+			OR (a.company_id = ? AND  cp.permission_name = '策略' )` // 兼容永续状态
 	o := orm.NewOrm()
-	err = o.Raw(sql, companyId).QueryRow(&item)
+	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return
 }
 
@@ -91,10 +100,13 @@ func GetCompanyDetailAllById(companyId int) (item *CompanyDetail, err error) {
 	sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile 
             FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
+			INNER JOIN company_report_permission AS p ON p.company_id = a.company_id
+			INNER JOIN chart_permission AS cp ON cp.chart_permission_id=p.chart_permission_id
 			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
-			WHERE a.company_id=? AND b.product_id = 2  `
+			WHERE a.company_id=? AND cp.cygx_auth=1
+			OR (a.company_id = ? AND  cp.permission_name = '策略' )` // 兼容永续状态
 	//WHERE a.company_id=?  AND b.status IN('正式','试用','永续')`
 	o := orm.NewOrm()
-	err = o.Raw(sql, companyId).QueryRow(&item)
+	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return
 }