Merge branch 'cygx/cygx_14-5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_apply.go

@@ -2077,6 +2077,7 @@ func (this *CompanyApplyController) ApplyContract() {
 		//升级
 		mapUpgrade := make(map[int]int)
 		mapExpensive := make(map[int]bool)
+		mapPoints := make(map[int]float64)
 		var expensiveYx int
 		permissionList, err := company.GetCompanyContractPermissionByCompanyContractId(contractItem.CompanyContractId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -2093,6 +2094,7 @@ func (this *CompanyApplyController) ApplyContract() {
 				mapExpensive[v.ChartPermissionId] = true
 				expensiveYx = v.ExpensiveYx
 			}
+			mapPoints[v.ChartPermissionId] = v.Points
 			permissionIds = append(permissionIds, v.ChartPermissionId)
 		}
 		//mapChartPermissionId := make(map[int]int)
@@ -2167,7 +2169,7 @@ func (this *CompanyApplyController) ApplyContract() {
 					})
 				}
 			}
-
+			n.Points = mapPoints[n.ChartPermissionId]
 			plist.Items = append(plist.Items, n)
 
 			if totalForever == 0 && !mapPermissionNameUpgrade[n.PermissionName] {
@@ -2199,6 +2201,9 @@ func (this *CompanyApplyController) ApplyContract() {
 				itemsIdExist[v.ChartPermissionId] = true
 			}
 		}
+		for _, v := range permissionList {
+			checkList = append(checkList, v.ChartPermissionId)
+		}
 		checkList = utils.IntersectInt(checkList, itemsIds)
 
 		//finalCheckList := make([]int, 0)