diff --git a/backend/__debug_bin1556003867 b/backend/__debug_bin1556003867 new file mode 100755 index 0000000..13fa9f9 Binary files /dev/null and b/backend/__debug_bin1556003867 differ diff --git a/backend/modules/medias/service.go b/backend/modules/medias/service.go index 1cff1f4..df60ed2 100644 --- a/backend/modules/medias/service.go +++ b/backend/modules/medias/service.go @@ -119,12 +119,13 @@ func (svc *Service) List(ctx context.Context, tenantId, userId int64, filter *Li } if filter.Bought != nil && *filter.Bought { - if len(boughtIDs) > 0 { - cond = cond. - AND(tbl.ID.IN(lo.Map(boughtIDs, func(item int64, _ int) Expression { - return Int(item) - })...)) + if len(boughtIDs) == 0 { + return []*ListItem{}, nil } + cond = cond. + AND(tbl.ID.IN(lo.Map(boughtIDs, func(item int64, _ int) Expression { + return Int(item) + })...)) } else { cond = cond.AND(tbl.Publish.EQ(Bool(true))) } diff --git a/frontend/src/components/List.vue b/frontend/src/components/List.vue index 5ec5e26..7dff693 100644 --- a/frontend/src/components/List.vue +++ b/frontend/src/components/List.vue @@ -3,8 +3,8 @@ - + @@ -55,16 +55,17 @@ export default defineComponent({ return; } + if (res.data.length < pageLimit.value) { + finished.value = true; + } + if (offset.value == "") { items.value = res.data; } else { items.value = items.value.concat(res.data); } - offset.value = res.data[res.data.length - 1].hash; + offset.value = res.data[res.data.length - 1]?.hash; - if (res.data.length < pageLimit.value) { - finished.value = true; - } }) .catch((err) => { console.error("ERROR", err);