|
|
@@ -1021,8 +1021,9 @@ func (this *BaseFromUsdaFasController) ExportUsdaFasList() {
|
|
|
|
|
|
classifyId, _ := this.GetInt("ClassifyId")
|
|
|
indexCode := this.GetString("IndexCode")
|
|
|
- if classifyId < 0 {
|
|
|
- br.Msg = "请选择分类"
|
|
|
+
|
|
|
+ if classifyId <= 0 && indexCode == "" {
|
|
|
+ br.Msg = "请选择分类或者指标"
|
|
|
return
|
|
|
}
|
|
|
dir, _ := os.Executable()
|
|
|
@@ -1061,9 +1062,6 @@ func (this *BaseFromUsdaFasController) ExportUsdaFasList() {
|
|
|
condition += ` AND classify_id=?`
|
|
|
pars = append(pars, classifyId)
|
|
|
}
|
|
|
- } else {
|
|
|
- condition += ` AND classify_id=?`
|
|
|
- pars = append(pars, classifyId)
|
|
|
}
|
|
|
if indexCode != "" {
|
|
|
condition += ` AND index_code=? `
|
