diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 31b5d5f10..e53ab8a9d 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -91,26 +91,28 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str db := dao.GetDB() sql := ` FROM sku_name t1 - JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? AND t2.status = ? + JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?/* AND t2.status = ?*/ LEFT JOIN store_sku_bind t4 ON t4.sku_id = t2.id AND t4.deleted_at = ? AND t4.store_id = ? JOIN store t3 ON t3.id = ? LEFT JOIN sku_name_place_bind t5 ON t1.id = t5.name_id AND t3.city_code = t5.place_code - WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR t4.status = ?) AND t1.status = ? + WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR t4.status = ?)/* AND t1.status = ?*/ ` - if isFocus { - sql += " AND t4.sku_id IS NOT NULL" - } else { - sql += " AND t4.sku_id IS NULL" - } sqlParams := []interface{}{ utils.DefaultTimeValue, - model.SkuStatusNormal, + // model.SkuStatusNormal, utils.DefaultTimeValue, storeID, storeID, utils.DefaultTimeValue, model.SkuStatusNormal, - model.SkuStatusNormal, + // model.SkuStatusNormal, + } + if isFocus { + sql += " AND t4.sku_id IS NOT NULL AND ((t2.status = ? AND t1.status = ?) OR t4.status = ?)" + sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal, model.SkuStatusNormal) + } else { + sql += " AND t4.sku_id IS NULL AND t2.status = ? AND t1.status = ?" + sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal) } if keyword != "" { keywordLike := "%" + keyword + "%"