no message

controllers/company_apply.go

@@ -121,6 +121,7 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
 			//	return
 			//}
 			var expensiveYx int
+			var pints float64 // 现在就一个行业有点数，先这么写吧
 			hasPermissions, e := company.GetCompanyContractPermissionByCompanyContractId(companyContract.CompanyContractId)
 			if e != nil {
 				br.Msg = "获取失败"
@@ -133,8 +134,11 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
 				if p.ExpensiveYx > 0 {
 					expensiveYx = p.ExpensiveYx
 				}
-			}
 
+				if p.Points > 0 {
+					pints = p.Points
+				}
+			}
 			checkItems := make([]*company.PermissionLookItem, 0)
 			raiPermissions, e := company.GetPermissionLookItemsExt("2", utils.COMPANY_PRODUCT_RAI_NAME)
 			if e != nil {
@@ -170,8 +174,8 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
 							}
 						}
 
-						if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID && n.Points > 0 {
+						if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID && pints > 0 {
-							n.PermissionName += "(" + fmt.Sprint(n.Points) + ")点"
+							n.PermissionName += "(" + fmt.Sprint(pints) + ")点"
 						}
 						checkList = append(checkList, n.ChartPermissionId)
 						checkItems = append(checkItems, n)
@@ -203,8 +207,8 @@ func (this *CompanyApplyController) ApplyContractHistoryList() {
 							//n.PermissionName += "(3w)"
 						}
 
-						if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID && n.Points > 0 {
+						if n.ChartPermissionId == utils.YAN_XUAN_KOU_DIAN_BAO_ID && pints > 0 {
-							n.PermissionName += "(" + fmt.Sprint(n.Points) + ")点"
+							n.PermissionName += "(" + fmt.Sprint(pints) + ")点"
 						}
 						//n.PermissionName += expMap[match.ExpensiveYx]
 						checkList = append(checkList, n.ChartPermissionId)

controllers/company_apply_v2.go

@@ -448,8 +448,8 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		}
 	}
 
-	// 权益主客观、行业升级、买方研选的处理
+	mapPermissionIdUpgrade := make(map[int]int) // 权益主客观、行业升级、买方研选的处理
-	mapPermissionIdUpgrade := make(map[int]int)
+	permissionNameMap := make(map[int]string)   // 权益行业名称处理
 	permissionNames := req.PermissionNames
 	expensiveYx := 0
 	if productId == 2 {
@@ -538,6 +538,13 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 				return
 			}
 		}
+
+		permissionNameMap, err = services.GetPermissionNameMap()
+		if err != nil {
+			br.Msg = "新增合同失败"
+			br.ErrMsg = "获取权限名称失败,Err:" + err.Error()
+			return
+		}
 	}
 
 	companyProduct, err := company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
@@ -708,6 +715,7 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		permissionMap := make(map[int]int) //权限id的map集合，用来避免重复添加权限校验
 		permissionItems := make([]*company.CompanyContractPermission, 0)
 		permissionLogs := make([]*company.CompanyContractPermissionLog, 0)
+
 		for _, v := range permissionArr {
 			item := new(company.CompanyContractPermission)
 			item.CompanyId = req.CompanyId
@@ -742,6 +750,8 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 				item.Points = req.Points
 			}
 
+			item.PermissionName = permissionNameMap[chartPermissionId]
+
 			item.StartDate = req.StartDate
 			item.EndDate = req.EndDate
 			item.ModifyTime = time.Now()