返回值增加分类数组

controllers/data_manage/edb_info.go

@@ -1743,11 +1743,16 @@ func (this *EdbInfoController) EdbInfoList() {
 	//是否展示英文标识
 	edbInfoItem.IsEnEdb = data.CheckIsEnEdb(edbInfoItem.EdbNameEn, edbInfoItem.Unit, edbInfoItem.UnitEn)
 	//查询目录
-	resultList, _ := data_manage.GetClassifyAllByClassifyId(edbInfoItem.ClassifyId)
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfoItem.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
 
 	resp.Paging = page
 	resp.Item = edbInfoItem
-	resp.ClassifyList = resultList
+	resp.ClassifyList = classifyList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

controllers/data_manage/predict_edb_info.go

@@ -98,9 +98,6 @@ func (this *PredictEdbInfoController) List() {
 	//获取英文频度
 	edbInfoItem.FrequencyEn = data.GetFrequencyEn(edbInfoItem.Frequency)
 
-	//查询目录
-	resultList, _ := data_manage.GetClassifyAllByClassifyId(edbInfoItem.ClassifyId)
-
 	// 未来的指标预测数据
 	predictDataList := make([]*data_manage.EdbData, 0)
 
@@ -277,9 +274,16 @@ func (this *PredictEdbInfoController) List() {
 	if edbInfoItem.DataList == nil {
 		edbInfoItem.DataList = make([]*data_manage.EdbData, 0)
 	}
+	//查询目录
+	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfoItem.ClassifyId)
+	if err != nil {
+		br.Msg = err.Error()
+		br.ErrMsg = errMsg
+		return
+	}
 	resp.Paging = page
 	resp.Item = edbInfoItem
-	resp.ClassifyList = resultList
+	resp.ClassifyList = classifyList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/data_manage/edb_info.go

@@ -307,7 +307,7 @@ type EdbData struct {
 type EdbInfoListResp struct {
 	Paging       *paging.PagingItem
 	Item         *EdbInfoList
-	ClassifyList []*EdbClassifySimplify
+	ClassifyList []*EdbClassifyIdItems
 }
 
 func GetEdbInfoByCondition(condition string, pars []interface{}) (item *EdbInfoList, err error) {