瀏覽代碼

全国数据导出

WH01243 1 年之前
父節點
當前提交
6e8e9be6e4
共有 3 個文件被更改,包括 16 次插入3 次删除
  1. 5 1
      src/jfw/front/dataExport.go
  2. 6 1
      src/jfw/front/ws_dataExport.go
  3. 5 1
      src/jfw/modules/app/src/app/front/ws_dataExport.go

+ 5 - 1
src/jfw/front/dataExport.go

@@ -536,7 +536,11 @@ func (d *DataExport) SuperSearchExport() error {
 			region = strings.Join(districtArr, ",")
 		}
 	}
-	saveData["region"] = util.If(region != "", strings.Split(region, ","), []string{}).([]string)
+	region_arr := strings.Split(region, ",")
+	if region == "" {
+		region_arr = []string{}
+	}
+	saveData["region"] = region_arr
 	//存入数据库
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
 	log.Println(_id, "saveData:", saveData)

+ 6 - 1
src/jfw/front/ws_dataExport.go

@@ -406,8 +406,13 @@ func (wd *WsDataExport) SearchExport() error {
 		} else {
 			region = strings.Join(districtArr, ",")
 		}
+
+	}
+	region_arr := strings.Split(region, ",")
+	if region == "" {
+		region_arr = []string{}
 	}
-	saveData["region"] = strings.Split(region, ",")
+	saveData["region"] = region_arr
 	//是否开启 正文 标题同时搜索只搜正文的开关
 	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
 	//存入数据库

+ 5 - 1
src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -399,7 +399,11 @@ func (wd *WsDataExport) SearchExport() error {
 			region = strings.Join(districtArr, ",")
 		}
 	}
-	saveData["region"] = strings.Split(region, ",")
+	region_arr := strings.Split(region, ",")
+	if region == "" {
+		region_arr = []string{}
+	}
+	saveData["region"] = region_arr
 	//是否开启 正文 标题同时搜索只搜正文的开关
 	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
 	//存入数据库