xyxie 1 year ago
parent
commit
6adb29dd02
1 changed files with 35 additions and 33 deletions
  1. 35 33
      controllers/contract/contract.go

+ 35 - 33
controllers/contract/contract.go

@@ -78,40 +78,42 @@ func (this *ContractController) GetServiceTemplateList() {
 				br.ErrMsg = "获取详情模板失败,Err:" + err.Error()
 				return
 			}
-			// 特殊处理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
+			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)
 					}
-					detail[k].Col2 = string(newCol2)
 				}
 			}