Merge branch 'dev_v4.8.83_wh' of qmx/jy into feature/v4.8.83

src/jfw/front/dataExport.go

@@ -13,7 +13,6 @@ import (
 	"sync"
 	"time"
 
-	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
@@ -518,7 +517,6 @@ func (d *DataExport) SuperSearchExport() error {
 	d.SetSession("Echo_searchMode", reqData.SearchMode)
 	d.SetSession("Echo_wordsMode", reqData.WordsMode)
 	d.SetSession("Echo_additionalWords", reqData.AdditionalWords)
-<<<<<<< HEAD
 	if source == "" {
 		saveData := reqData.PassBidSearchExport(config.Sysconfig)
 
@@ -528,58 +526,37 @@ func (d *DataExport) SuperSearchExport() error {
 		saveData["comeinfrom"] = "supersearchPage"
 		//是否开启 正文 标题同时搜索只搜正文的开关
 		saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
-
 		region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
 		if region != "" && reqData.City != "" {
 			region += "," + reqData.City
 		} else {
 			region = reqData.City
 		}
-		saveData["region"] = util.If(region != "", strings.Split(region, ","), []string{}).([]string)
+		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, ",")
+			}
+		}
+		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)
 		return d.Redirect("/front/dataExport/toCreateOrderPage/" + encrypt.SE.Encode2Hex(_id))
 	}
 	return nil
-=======
-	saveData := reqData.PassBidSearchExport(config.Sysconfig)
-	saveData["selectType"] = selectType
-	saveData["s_openid"] = openid
-	saveData["s_userid"] = userId
-	saveData["comeinfrom"] = "supersearchPage"
-	//是否开启 正文 标题同时搜索只搜正文的开关
-	saveData["searchTypeSwitch"], _ = config.Sysconfig["searchTypeSwitch"].(bool)
-	region := util.If(reqData.Area == "全国", "", reqData.Area).(string)
-	if region != "" && reqData.City != "" {
-		region += "," + reqData.City
-	} 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, ",")
-		}
-	}
-	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)
-	return d.Redirect("/front/dataExport/toCreateOrderPage/" + encrypt.SE.Encode2Hex(_id))
->>>>>>> master
 }
 func (d *DataExport) ToCreateOrderPage(_id string) error {
 	id := encrypt.SE.Decode4Hex(_id)