汾渭数据源对接-excel文件名修改

controllers/data_manage/fenwei_data.go

@@ -811,6 +811,11 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 	classifyId, _ := this.GetInt("ClassifyId") //分类
 	indexCode := this.GetString("IndexCode")   //指标唯一编码
 
+	if classifyId < 0 {
+		br.Msg = "请选择分类"
+		return
+	}
+
 	//userId := sysUser.AdminId
 	//超管账号可以查看分类下的所有频度数据
 	/*if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_ADMIN {
@@ -835,7 +840,7 @@ func (this *EdbInfoController) FenWeiIndexDataExport() {
 		return
 	}
 
-	fileName := `粮油商务网`
+	fileName := `汾渭网页数据`
 	if classifyId > 0 && indexCode == "" {
 		fenWeiClassify, err := data_manage.GetFenweiClassifyItemByClassifyId(classifyId)
 		if err != nil {

models/data_manage/base_from_fenwei.go

@@ -188,7 +188,7 @@ func GetBaseFromFenweiIndexByIndexCode(indexCode string) (list *BaseFromFenweiIn
 func GetFenWeiIndexFrequency(classifyId int) (items []*string, err error) {
 	sql := `SELECT DISTINCT frequency 
         FROM base_from_fenwei_index 
-        WHERE frequency IS NOT NULL`
+        WHERE frequency != ''`
 
 	// 如果 classifyId > 0，则添加该条件
 	if classifyId > 0 {