WH01243 1 år sedan
förälder
incheckning
0f8356b507

+ 15 - 0
src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -371,6 +371,7 @@ func (wd *WsDataExport) SearchExport() error {
 		SearchMode:      searchMode,                                   //搜索模式:0:精准搜索;1:模糊搜索
 		WordsMode:       wordsMode,                                    //搜索关键词模式;默认0:包含所有,1:包含任意
 		AdditionalWords: wd.GetString("additionalWords"),              //关键词:附加关键词(副:五组,每组最多15个字符)
+		District:        d.GetString("district"),                      //搜索词
 	}
 	saveData := reqData.PassBidSearchExport(config.Sysconfig)
 	saveData["selectType"] = strings.Join(jy.GetVipState(wd.Session(), *config.Middleground, userId).GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
@@ -383,6 +384,20 @@ func (wd *WsDataExport) SearchExport() error {
 	} else {
 		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)

+ 1 - 1
src/jfw/modules/app/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.1.3
+	app.yhyue.com/moapp/jypkg v1.0.9
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1

+ 2 - 2
src/jfw/modules/app/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v1.1.3 h1:py1imaq0SQvoU77zKhUJp4CC9oOg2Cb+EAHfY9Ylek0=
-app.yhyue.com/moapp/jypkg v1.1.3/go.mod h1:sMZxJOsD3STWGY04aDhUtRD+1u5nqhQpdDdpSW3JC1Y=
+app.yhyue.com/moapp/jypkg v1.0.9 h1:UPxqzBvAwPoZCGSohsXWQmIc+TYVCGvB8+x2VD3xjnI=
+app.yhyue.com/moapp/jypkg v1.0.9/go.mod h1:sMZxJOsD3STWGY04aDhUtRD+1u5nqhQpdDdpSW3JC1Y=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=