diff --git a/app/adminapi/lists/approve/ApproveLists.php b/app/adminapi/lists/approve/ApproveLists.php index cb523c3a6..e8943b3e5 100644 --- a/app/adminapi/lists/approve/ApproveLists.php +++ b/app/adminapi/lists/approve/ApproveLists.php @@ -55,7 +55,7 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface public function lists2(): array { - return Approve::where($this->searchWhere) + $list = Approve::where($this->searchWhere) ->where($this->queryWhere()) ->with('task') ->field('*') @@ -72,6 +72,15 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface return $company[0]['company_name']; }) ->toArray(); + $count = Approve::where($this->searchWhere) + ->where($this->queryWhere())->count(); + + return [ + 'lists' => $list, + 'count' => $count, + 'page_no' => $this->pageNo, + 'page_size' => $this->pageSize, + ]; } public function count(): int