From 77a0571a60240f28d51c3776370fc8377ba9c49f Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 31 May 2021 10:17:42 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 180686c02..9930e5795 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -4669,7 +4669,12 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
 		}
 	}
 	sql += ` )t1
-	LEFT JOIN place t2 ON t2.name = t1.city_name
+	LEFT JOIN place t2 ON t2.name = t1.city_name `
+	if cityCode > 0 {
+		sql += " AND t2.code = ?"
+		sqlParams = append(sqlParams, cityCode)
+	}
+	sql += `
 	WHERE 1 = 1
 	`
 	if keyword != "" {
@@ -4681,11 +4686,6 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
 		sql += " AND t1.store_id IN (" + dao.GenQuestionMarks(len(vendorStoreIDs)) + ")"
 		sqlParams = append(sqlParams, vendorStoreIDs)
 	}
-	if cityCode > 0 {
-		sql += " AND t2.code = ?"
-		sqlParams = append(sqlParams, cityCode)
-	}
-
 	//if radius > 0 {
 	//	sql += " AND ROUND(t1.distance * 1000) < ?"
 	//	sqlParams = append(sqlParams, radius)
@@ -4717,8 +4717,6 @@ func QueryPageSkus(ctx *jxcontext.Context, vendorID int, vendorStoreIDs []string
 			panic(r)
 		}
 	}()
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	if err = dao.GetRowsTx(txDB, &results, sql, sqlParams...); err == nil {
 		pagedInfo = &model.PagedInfo{
 			TotalCount: dao.GetLastTotalRowCount2(db, txDB),