Merge branch 'feature/eta1.6.7_permission' into debug

controllers/contract/contract.go

@@ -78,44 +78,6 @@ func (this *ContractController) GetServiceTemplateList() {
 				br.ErrMsg = "获取详情模板失败，Err:" + err.Error()
 				return
 			}
-			if productId == 1 {
-				// 特殊处理Ficc周报、商品双周报、数据点评的套餐显示
-				// 把detail转成go struct
-				// 查询默认的公有权限
-				publicPermissionList, tmpE := models.GetFiccPermissionSecondPublic()
-				if tmpE != nil {
-					br.Msg = "获取失败"
-					br.ErrMsg = "获取默认的公有权限失败，Err:" + tmpE.Error()
-					return
-				}
-				publicPermissionIds := make([]int, 0)
-				publicPermissionNames := make([]string, 0)
-				for _, v := range publicPermissionList {
-					publicPermissionIds = append(publicPermissionIds, v.ChartPermissionId)
-					publicPermissionNames = append(publicPermissionNames, v.PermissionName)
-				}
-				for k, v := range detail {
-					if v.Id == 4 || v.Id == 5 || v.Id == 6 {
-						detailStruct := new(contract.ServiceTemplateDetailCol2)
-						e := json.Unmarshal([]byte(v.Col2), detailStruct)
-						if e != nil {
-							br.Msg = "获取失败"
-							br.ErrMsg = "获取套餐信息失败, json.Unmarshal Err: " + e.Error()
-							return
-						}
-						//替换默认品种
-						detailStruct.ValueId = publicPermissionIds
-						detailStruct.Value = strings.Join(publicPermissionNames, ",")
-						newCol2, e := json.Marshal(detailStruct)
-						if e != nil {
-							br.Msg = "获取失败"
-							br.ErrMsg = "获取套餐信息失败, json.Marshal Err: " + e.Error()
-							return
-						}
-						detail[k].Col2 = string(newCol2)
-					}
-				}
-			}
 
 			tmpList[j].Detail = detail
 			// 权益存在第三级主客观套餐-CRM8.8
@@ -162,6 +124,44 @@ func (this *ContractController) GetServiceTemplateList() {
 			br.ErrMsg = "获取详情模板失败，Err:" + err.Error()
 			return
 		}
+		if productId == 1 && list[i].ServiceTemplateId == 2 {
+			// 特殊处理Ficc周报、商品双周报、数据点评的套餐显示
+			// 把detail转成go struct
+			// 查询默认的公有权限
+			publicPermissionList, tmpE := models.GetFiccPermissionSecondPublic()
+			if tmpE != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取默认的公有权限失败，Err:" + tmpE.Error()
+				return
+			}
+			publicPermissionIds := make([]int, 0)
+			publicPermissionNames := make([]string, 0)
+			for _, v := range publicPermissionList {
+				publicPermissionIds = append(publicPermissionIds, v.ChartPermissionId)
+				publicPermissionNames = append(publicPermissionNames, v.PermissionName)
+			}
+			for k, v := range detail {
+				if v.Id == 4 || v.Id == 5 || v.Id == 6 {
+					detailStruct := new(contract.ServiceTemplateDetailCol2)
+					e := json.Unmarshal([]byte(v.Col2), detailStruct)
+					if e != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取套餐信息失败, json.Unmarshal Err: " + e.Error()
+						return
+					}
+					//替换默认品种
+					detailStruct.ValueId = publicPermissionIds
+					detailStruct.Value = strings.Join(publicPermissionNames, ",")
+					newCol2, e := json.Marshal(detailStruct)
+					if e != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "获取套餐信息失败, json.Marshal Err: " + e.Error()
+						return
+					}
+					detail[k].Col2 = string(newCol2)
+				}
+			}
+		}
 		if productId == 1 && contractType == "补充协议" {
 			for _, v := range detail {
 				//ficc 的合同模板的 补充协议需要将默认的宏观经济给移除掉