From ee9b84bd80c31d148ce9cfeb3b2fca655c494dad Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 7 Nov 2018 11:27:42 +0800 Subject: [PATCH] - handle level 1 leaf category in func GetSkuNames and GetStoreSkus --- business/jxstore/cms/sku.go | 11 ++++++----- business/jxstore/cms/store_sku.go | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index ab707953d..a7e5e7af4 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -208,12 +208,13 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, params map[string]inter if err = dao.GetEntity(db, cat); err != nil { return nil, err } - if cat.Level == 1 { - sql += " AND t1.category_id IN (SELECT id FROM sku_category WHERE parent_id = ?)" - } else { - sql += " AND t1.category_id = ?" - } + sql += " AND (t1.category_id = ?" sqlParams = append(sqlParams, cat.ID) + if cat.Level == 1 { + sql += " OR t1.category_id IN (SELECT id FROM sku_category WHERE parent_id = ?)" + sqlParams = append(sqlParams, cat.ID) + } + sql += ")" } if params["jdID"] != nil { sql += " AND t1.jd_id = ?" diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 796b7f5e1..1dcf2a907 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -109,12 +109,13 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str if err = dao.GetEntity(db, cat); err != nil { return nil, err } - if cat.Level == 1 { - sql += " AND t1.category_id IN (SELECT id FROM sku_category WHERE parent_id = ?)" - } else { - sql += " AND t1.category_id = ?" - } + sql += " AND (t1.category_id = ?" sqlParams = append(sqlParams, cat.ID) + if cat.Level == 1 { + sql += " OR t1.category_id IN (SELECT id FROM sku_category WHERE parent_id = ?)" + sqlParams = append(sqlParams, cat.ID) + } + sql += ")" } if params["jdID"] != nil { sql += " AND t1.jd_id = ?"