mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
chenbo 2023-10-26 13:56:50 +08:00
parent 9fbc20f3fa
commit c61f3ca783
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/adminapi/lists/approve/ApproveLists.php
View File

@ -55,7 +55,7 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface
public function lists2(): array public function lists2(): array
{ {
return Approve::where($this->searchWhere) $list = Approve::where($this->searchWhere)
->where($this->queryWhere()) ->where($this->queryWhere())
->with('task') ->with('task')
->field('*') ->field('*')
@ -72,6 +72,15 @@ class ApproveLists extends BaseAdminDataLists implements ListsSearchInterface
return $company[0]['company_name']; return $company[0]['company_name'];
}) })
->toArray(); ->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 public function count(): int