diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 1ffd20c84..1573ef52b 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -3145,6 +3145,7 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ t1.best_seller FROM sku_name t1 LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? + LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ? WHERE t1.deleted_at = ? ` } else { @@ -3184,17 +3185,18 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [ t1.best_seller, t2.id sku_id FROM sku_name t1 LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? + LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ? WHERE t1.deleted_at = ? ` } sqlParams := []interface{}{ - utils.DefaultTimeValue, utils.DefaultTimeValue, + utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", utils.DefaultTimeValue, } if keyword != "" { keywordLike := "%" + keyword + "%" sql += ` - AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ? OR t1.upc LIKE ? OR t1.id LIKE ? OR t2.id LIKE ?) ` - sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike) + AND (t1.name LIKE ? OR t1.prefix LIKE ? OR t2.comment LIKE ? OR t1.upc LIKE ? OR t1.id LIKE ? OR t2.id LIKE ? OR t3.vendor_thing_id = ?) ` + sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keyword) } if len(skuNameIDs) > 0 { sql += " AND t1.id IN (" + dao.GenQuestionMarks(len(skuNameIDs)) + ")"