diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 87fc6ef99..f77357e6c 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -371,9 +371,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo return nil, err } pageSize = jxutils.FormalizePageSize(pageSize) - if offset < 0 { - offset = 0 - } + offset = jxutils.FormalizePageOffset(offset) sqlOffset := offset sqlPageSize := pageSize isSaleInfo := params["stFromTime"] != nil @@ -396,7 +394,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo } skuNamesInfo = &StoreSkuNamesInfo{} - if !isBySku && sqlPageSize < 1000 { + if !isBySku && sqlPageSize != model.UnlimitedPageSize { sql2 := ` SELECT SQL_CALC_FOUND_ROWS t3.id store_id, t1.id name_id @@ -481,7 +479,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo globals.SugarLogger.Debugf("GetStoresSkusNew updateSaleInfo4StoreSkuName:%v", time.Now().Sub(beginTime)) } if err == nil { - if !(offset == 0 && pageSize == model.UnlimitedPageSize) { + if true { //!(offset == 0 && pageSize == model.UnlimitedPageSize) { storeIDs, skuIDs = GetStoreAndSkuIDsFromInfo(skuNamesInfo) } beginTime := time.Now()