Merge branch 'fix/rai_0802' into debug

controllers/company_apply_v2.go

@@ -427,24 +427,42 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		// 给升级的产业ID加一个极大值判断处理
 		permissionSlice := strings.Split(req.PermissionIds, ",")
 		mapPermissionId := make(map[int]int)
-		var permissionIdsNew string
+		//var permissionIdsNew string
 		var permissionIdOnly int //处理普通权限与升级权限同时勾选的时候的拦截
 		expId := utils.PERMISSION_ID_YANXUAN_DIFF + utils.CHART_PERMISSION_ID_YANXUAN
+
+		// 获取行业主观对应的客观ID
+		subObjMap, e := services.GetRaiSubObjPermissionIdMap()
+		if e != nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "获取行业主观对应的客观ID失败, Err: " + e.Error()
+			return
+		}
+
+		strPermissionIdArr := make([]string, 0) // 最终过滤后的权限IDs
 		for _, v := range permissionSlice {
 			permissionId, _ := strconv.Atoi(v)
 
 			// 研选5w的处理
 			if permissionId == expId {
-				permissionIdsNew += strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + ","
+				//permissionIdsNew += strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN) + ","
+				strPermissionIdArr = append(strPermissionIdArr, strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN))
 				expensiveYx = 1
 				continue
 			}
 
 			if permissionId > utils.PERMISSION_ID_UPGRADE {
-				permissionIdsNew += strconv.Itoa(permissionId-utils.PERMISSION_ID_UPGRADE) + ","
+				//permissionIdsNew += strconv.Itoa(permissionId-utils.PERMISSION_ID_UPGRADE) + ","
 				permissionIdOnly = permissionId - utils.PERMISSION_ID_UPGRADE
+				// 升级权限, 需要加入客观的权限
+				subId := permissionId - utils.PERMISSION_ID_UPGRADE
+				strPermissionIdArr = append(strPermissionIdArr, strconv.Itoa(subId))
+				if subObjMap[subId] > 0 {
+					strPermissionIdArr = append(strPermissionIdArr, strconv.Itoa(subObjMap[subId]))
+				}
 			} else {
-				permissionIdsNew += strconv.Itoa(permissionId) + ","
+				//permissionIdsNew += strconv.Itoa(permissionId) + ","
+				strPermissionIdArr = append(strPermissionIdArr, v)
 				permissionIdOnly = permissionId
 			}
 			if _, ok := mapPermissionId[permissionIdOnly]; ok {
@@ -454,7 +472,8 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 			}
 			mapPermissionId[permissionIdOnly] = permissionIdOnly
 		}
-		req.PermissionIds = strings.TrimRight(permissionIdsNew, ",")
+		req.PermissionIds = strings.Join(strPermissionIdArr, ",")
+		//req.PermissionIds = strings.TrimRight(permissionIdsNew, ",")
 
 		// 是否为权益内部人员, 非权益内部人员只能勾选行业不能勾选单独的主客观, 需要通过主观的ID去查客观的ID
 		//isRai, e := services.CheckRaiAdmin(sysUser.AdminId)
@@ -464,13 +483,13 @@ func (this *CompanyApplyController) ApplyTurnPositive() {
 		//	return
 		//}
 		//if !isRai {
-		permissionStr, err := company.GetPermissionIdById(req.PermissionIds)
-		if err != nil {
-			br.Msg = "获取信息失败"
-			br.ErrMsg = "获取主观客观权限信息失败,Err:" + err.Error()
-			return
-		}
-		req.PermissionIds = permissionStr
+		//permissionStr, err := company.GetPermissionIdById(req.PermissionIds)
+		//if err != nil {
+		//	br.Msg = "获取信息失败"
+		//	br.ErrMsg = "获取主观客观权限信息失败,Err:" + err.Error()
+		//	return
+		//}
+		//req.PermissionIds = permissionStr
 		//}
 
 		// 升级map