Merge branch 'feature/yb11.10_rai_report' of hongze/hz_crm_api into master

controllers/company_permission.go

@@ -282,7 +282,7 @@ func (this *CompanyPermissionController) ListByContract() {
 		for _, v := range allFiccPermissions {
 			if v.ParentId == 0 {
 				//合同这边市场策略不需要体现出来，所以调整返回
-				if v.PermissionName == "市场策略" {
+				if v.PermissionName == "市场策略" || v.PermissionName == "固定收益" {
 					continue
 				}
 				p := new(company.PermissionSetList)

services/contract/contract.go

@@ -1261,7 +1261,7 @@ func GetServicePermissionMap(serviceList []*contract.ContractServiceAndDetail) (
 			for _, v := range allFiccPermissions {
 				if v.ParentId == 0 {
 					//合同这边市场策略不需要体现出来，所以调整返回
-					if v.PermissionName == "市场策略" {
+					if v.PermissionName == "市场策略" || v.PermissionName == "固定收益" {
 						continue
 					}
 					items, ok := permissionMap[v.ChartPermissionId]

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:正式客户申请服务更新