Selaa lähdekoodia

Merge branch 'master' into feature/v4.9.18

lianbingjie 1 vuosi sitten
vanhempi
commit
3326cd92bf
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      src/jfw/front/dataServiceArea.go

+ 2 - 2
src/jfw/front/dataServiceArea.go

@@ -73,7 +73,7 @@ func init() {
 		}
 	}
 	KeyBiddingArea, _ := config.Sysconfig["keyBiddingArea"].(string)
-	resArr, err := g.DB().Query(gctx.New(), fmt.Sprintf(`SELECT area ,city,district,pcode  FROM jyseo_test.seo_area_code where  class = 4 and area in ('%s') %s`, strings.ReplaceAll(KeyBiddingArea, ",", `','`), `and (district LIKE '%县%' or district LIKE '%市%')`))
+	resArr, err := g.DB().Query(gctx.New(), fmt.Sprintf(`SELECT area ,city,district,pcode  FROM seo_area_code where  state = 1 and class = 4 and area in ('%s') %s`, strings.ReplaceAll(KeyBiddingArea, ",", `','`), `and (district LIKE '%县%' or district LIKE '%市%')`))
 	if err == nil && !resArr.IsEmpty() {
 		for _, m := range resArr.List() {
 			KeyBiddingAreaMap = append(KeyBiddingAreaMap, keyBidding{
@@ -176,7 +176,7 @@ func DistrictsTender(number int) []argument {
 		acronym := KeyBiddingAreaMap[i2]
 		data = append(data, argument{
 			common.If(strings.Contains(acronym.district, "区"), fmt.Sprintf("%s%s", acronym.city, acronym.district), acronym.district).(string),
-			fmt.Sprintf("/list/area/%s.html", acronym.code),
+			fmt.Sprintf("/list/city/%s.html", acronym.code),
 		})
 	}
 	if data != nil && len(data) > 0 {