Browse Source

Merge branch 'eta_2.2.5_rzd_1012@guomengyuan' of http://8.136.199.33:3000/eta_server/eta_api into eta_2.2.5_rzd_1012@guomengyuan

gmy 4 months ago
parent
commit
444bc7cccd
1 changed files with 2 additions and 2 deletions
  1. 2 2
      models/data_manage/base_from_rzd_index.go

+ 2 - 2
models/data_manage/base_from_rzd_index.go

@@ -80,7 +80,7 @@ func GetRzdIndex(condition string, pars interface{}) (items []*BaseFromFenweiInd
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` ORDER BY sort ASC, base_from_rzd_index_id asc`
+	sql += ` ORDER BY base_from_rzd_index_id asc`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
@@ -93,7 +93,7 @@ func GetRzdIndexFrequency(classifyId int) (items []*string, err error) {
 
 	// 如果 classifyId > 0,则添加该条件
 	if classifyId > 0 {
-		sql += ` AND classify_id = ?`
+		sql += ` AND base_from_rzd_classify_id = ?`
 	}
 
 	sql += ` ORDER BY FIELD(frequency, '日度', '周度', '月度', '季度', '半年度', '年度')`