Merge branch 'feature/yb11.10_rai_report' into debug

controllers/company_permission.go

@@ -285,6 +285,9 @@ func (this *CompanyPermissionController) ListByContract() {
 				if v.PermissionName == "市场策略" {
 					continue
 				}
+				if v.PermissionName == "固定收益" {
+					continue
+				}
 				p := new(company.PermissionSetList)
 				p.Items = make([]*company.PermissionSetItem, 0)
 				p.CheckList = make([]int, 0)

models/chart_permission.go

@@ -67,7 +67,7 @@ func GetYbChartPermissionFirst() (list []*YbChartPermissionFirst, err error) {
 // GetFiccPermissionExceptTactic 获取除了市场策略外的ficc权限
 func GetFiccPermissionExceptTactic() (items []*ChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略' ORDER BY sort ASC`
+	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略'  and classify_name != '固定收益' ORDER BY sort ASC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

services/contract/contract.go

@@ -1264,6 +1264,9 @@ func GetServicePermissionMap(serviceList []*contract.ContractServiceAndDetail) (
 					if v.PermissionName == "市场策略" {
 						continue
 					}
+					if v.PermissionName == "固定收益" {
+						continue
+					}
 					items, ok := permissionMap[v.ChartPermissionId]
 					if ok {
 						for _, n := range items {

utils/constants.go

@@ -164,8 +164,8 @@ const (
 	RAI_DEPARTMENT_ID         = 5 // 权益部门ID
 )
 
-var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "新能源", "市场策略"}
-var PermissionAllClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "新能源", "市场策略", "权益"}
+var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "新能源", "市场策略", "固定收益"}
+var PermissionAllClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业", "新能源", "市场策略", "固定收益", "权益"}
 
 //apply_method:申请类型：1:试用->正式,2:冻结—>试用,3:流失—>正式,4:试用延期,5:原销售申请领取流失客户，6:正式客户申请服务更新