Support page = 0 and offset > 0 in getDocumentList() to avoid unnecessary count query

This commit is contained in:
Kijin Sung 2023-06-19 02:15:35 +09:00
parent f34c27c26b
commit 87f798f94f
11 changed files with 19 additions and 2 deletions

View file

@ -1351,9 +1351,16 @@ class DocumentModel extends Document
}
$args->order_type = (isset($searchOpt->order_type) && $searchOpt->order_type === 'desc') ? 'desc' : 'asc';
$args->sort_index = $searchOpt->sort_index;
$args->page = $searchOpt->page ?? 1;
$args->list_count = $searchOpt->list_count ?? 20;
$args->page_count = $searchOpt->page_count ?? 10;
$args->page = intval($searchOpt->page ?? 1);
if ($args->page > 0)
{
$args->page_count = $searchOpt->page_count ?? 10;
}
elseif (isset($searchOpt->offset) && $searchOpt->offset > 0)
{
$args->offset = intval($searchOpt->offset);
}
$args->start_date = $searchOpt->start_date ?? null;
$args->end_date = $searchOpt->end_date ?? null;
$args->start_regdate = $searchOpt->start_regdate ?? null;

View file

@ -48,5 +48,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -16,5 +16,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -54,5 +54,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -51,5 +51,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -51,5 +51,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -28,5 +28,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -21,5 +21,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -59,5 +59,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -36,5 +36,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>

View file

@ -27,5 +27,6 @@
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
<offset var="offset" />
</navigation>
</query>