Merge branch 'feature/jiayue' into debug

models/jiayue/category.go

@@ -48,7 +48,7 @@ func GetDictCategory(condition string, pars []interface{}, orderRule string) (ca
 	}()
 
 	fields := "ID, PARENT_ID, PARENT_NAME, TYPE, CODE, NAME, ICON, SORTING, DESCRIPTION, USER_ID, PATH"
-	querySql := fmt.Sprintf(`SELECT %s FROM %s WHERE %s %s`, fields, IndexMenuTableName, condition, orderRule)
+	querySql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, IndexMenuTableName, condition, orderRule)
 	order := ``
 	if orderRule != "" {
 		order += fmt.Sprintf(` ORDER BY %s`, orderRule)

services/index_data/jiayue_platform.go

@@ -95,8 +95,6 @@ func GetIndexAndDataFromJiaYue(indexCode, startDate, endDate string, sourceArr [
 		return
 	}
 	index := indexes[0]
-
-	// 获取指标数据
 	if index.Id <= 0 {
 		err = fmt.Errorf("指标信息有误")
 		return
@@ -106,6 +104,7 @@ func GetIndexAndDataFromJiaYue(indexCode, startDate, endDate string, sourceArr [
 		return
 	}
 
+	// 指标数据
 	dataCond := " INDEX_ID = :1"
 	dataPars := make([]interface{}, 0)
 	dataPars = append(dataPars, index.Id)
@@ -123,8 +122,16 @@ func GetIndexAndDataFromJiaYue(indexCode, startDate, endDate string, sourceArr [
 		return
 	}
 
-	var dictMenu []jiayue.DictCategory
-	data = FormatItem2Resp(index, indexData, dictMenu)
+	// 指标目录
+	menuCond := ` R.INDEX_ID = :1`
+	menuPars := make([]interface{}, 0)
+	menuPars = append(menuPars, index.Id)
+	menus, e := jiayue.GetIndexCategory(menuCond, menuPars, "")
+	if e != nil {
+		err = fmt.Errorf("GetDictCategory err: %s", e.Error())
+		return
+	}
+	data = FormatItem2Resp(index, indexData, menus)
 	return
 }
 
@@ -231,17 +238,20 @@ func GetNewIndexAndDataFromJiaYue() (indexList []*response.IndexResp, err error)
 		//
 
 		// 指标目录
-		menuCond := ` R.INDEX_ID = :1`
-		menuPars := make([]interface{}, 0)
-		menuPars = append(menuPars, v.Id)
-		menus, e := jiayue.GetIndexCategory(menuCond, menuPars, "")
-		if e != nil {
-			err = fmt.Errorf("GetDictCategory err: %s", e.Error())
-			return
-		}
+		//menuCond := ` R.INDEX_ID = :1`
+		//menuPars := make([]interface{}, 0)
+		//menuPars = append(menuPars, v.Id)
+		//menus, e := jiayue.GetIndexCategory(menuCond, menuPars, "")
+		//if e != nil {
+		//	err = fmt.Errorf("GetDictCategory err: %s", e.Error())
+		//	return
+		//}
 
-		var indexData []jiayue.DictData
-		item := FormatItem2Resp(v, indexData, menus)
+		var (
+			indexData []jiayue.DictData
+			dictMenu  []jiayue.DictCategory
+		)
+		item := FormatItem2Resp(v, indexData, dictMenu)
 		indexList = append(indexList, item)
 	}
 	return