Merge branch 'aj_mysteel'

models/base_from_mysteel_chemical.go

@@ -262,7 +262,7 @@ func (m *BaseFromMysteelChemicalIndex) Update(cols []string) (err error) {
 // GetNoMergeIndexByFrequencyCount 获取未合并的指标总数量
 func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyCount(frequency string) (total int64, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE frequency=? AND index_name NOT LIKE "%停%"  `
+	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE frequency = ? AND merge_file_path = '' AND index_name NOT LIKE "%停%"  `
 	err = o.Raw(sql, frequency).QueryRow(&total)
 
 	return