fix

controller/contract/service.go

@@ -39,7 +39,7 @@ func (sr *ServiceController) List(c *gin.Context) {
 	var err error
 	if productIdStr == "" {
 		list, err = fms.GetContractServiceTemplateSecond()
-	}else{
+	} else {
 		productId, _ = strconv.Atoi(productIdStr)
 		list, err = fms.GetContractServiceTemplateMapByProductId(productId)
 	}
@@ -96,7 +96,6 @@ func (sr *ServiceController) List(c *gin.Context) {
 		v.Detail = detail
 		v.Children = secFormatList
 
-
 		if v.Title == "FICC小套餐" {
 			//获取ficc小套餐品种
 			sysConf := new(system.SysConfig)
@@ -143,19 +142,45 @@ func (sr *ServiceController) List(c *gin.Context) {
 				if classifyArr[i] == "宏观经济" {
 					checkList = append(checkList, 1)
 				}
-				p := new(crm.PermissionSetList)
-				p.ClassifyName = classifyArr[i]
-				p.Items = ficcItemMap[classifyArr[i]]
-				p.CheckList = make([]int, 0)
-				v.Items = append(v.Items, p)
+
+				pItem := fms.ContractServiceTemplateItem{
+					ServiceTemplateId: 90000 + i,
+					ProductId:         1,
+					Pid:               v.ServiceTemplateId,
+					ParentTitle:       v.Title,
+					Title:             classifyArr[i],
+				}
+
+				childs := make([]*fms.ContractServiceTemplateMapItems, 0)
+				ficcItems := ficcItemMap[classifyArr[i]]
+				for _, ficcItem := range ficcItems {
+					tempItem := fms.ContractServiceTemplateItem{
+						ServiceTemplateId: pItem.ServiceTemplateId + ficcItem.ChartPermissionId,
+						ProductId:         1,
+						Pid:               pItem.ServiceTemplateId,
+						ParentTitle:       pItem.Title,
+						Title:             ficcItem.PermissionName,
+						ChartPermissionId: ficcItem.ChartPermissionId,
+					}
+					newpItem := fms.ContractServiceTemplateMapItems{
+						ContractServiceTemplateItem: tempItem,
+					}
+					childs = append(childs, &newpItem)
+				}
+				tempItem := fms.ContractServiceTemplateMapItems{
+					ContractServiceTemplateItem: pItem,
+					Children:                    childs,
+				}
+
+				v.Children = append(v.Children, &tempItem)
 			}
 		}
 
 		allMap[item.ProductId] = append(allMap[item.ProductId], v)
 	}
 	allTitleMap := map[int]string{
-		1:"FICC套餐",
-		2:"权益套餐",
+		1: "FICC套餐",
+		2: "权益套餐",
 	}
 	if productId == 0 {
 		tmp1 := &fms.ContractServiceTemplateList{
@@ -168,7 +193,7 @@ func (sr *ServiceController) List(c *gin.Context) {
 		}
 		respList = append(respList, tmp1)
 		respList = append(respList, tmp2)
-	}else{
+	} else {
 		tmp := &fms.ContractServiceTemplateList{
 			Title:    allTitleMap[productId],
 			Children: allMap[productId],
@@ -203,7 +228,7 @@ func (sr *ServiceController) SimpleList(c *gin.Context) {
 			for _, sv := range industryList {
 				allList = append(allList, sv)
 			}
-		}else{
+		} else {
 			allList = append(allList, list[i])
 		}
 	}
@@ -215,8 +240,8 @@ func (sr *ServiceController) SimpleList(c *gin.Context) {
 		allMap[item.ProductId] = append(allMap[item.ProductId], v)
 	}
 	allTitleMap := map[int]string{
-		1:"FICC套餐",
-		2:"权益套餐",
+		1: "FICC套餐",
+		2: "权益套餐",
 	}
 	tmp1 := &fms.ContractServiceTemplateList{
 		Title:    allTitleMap[1],

models/fms/contract_service_template.go

@@ -2,7 +2,6 @@ package fms
 
 import (
 	"hongze/fms_api/global"
-	"hongze/fms_api/models/crm"
 	"time"
 )
 
@@ -57,7 +56,6 @@ type ContractServiceTemplateMapItems struct {
 	ContractServiceTemplateItem
 	Children []*ContractServiceTemplateMapItems `json:"children"`
 	Detail   []*ContractServiceDetail           `json:"detail"`
-	Items    []*crm.PermissionSetList
 }
 
 type ContractServiceTemplateMapItems2 struct {