微信条件保存修改

src/jfw/front/ws_dataExport.go

@@ -390,9 +390,23 @@ func (wd *WsDataExport) SearchExport() error {
 	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
 	if region != "" && reqData.City != "" {
 		region += "," + reqData.City
-	} else {
+	} else if region == "" {
 		region = reqData.City
 	}
+	if reqData.District != "" {
+		districtArr := []string{}
+		for _, v := range strings.Split(reqData.District, ",") {
+			if len(strings.Split(v, "_")) > 1 {
+				district := strings.Split(v, "_")[1]
+				districtArr = append(districtArr, district)
+			}
+		}
+		if region != "" {
+			region += "," + strings.Join(districtArr, ",")
+		} else {
+			region = strings.Join(districtArr, ",")
+		}
+	}
 	saveData["region"] = strings.Split(region, ",")
 	//是否开启 正文 标题同时搜索只搜正文的开关
 	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)