HDK/hyperf-admin
1
0
Fork 0
mirror of http://124.126.16.154:8888/singularity/hyperf-admin.git synced 2026-01-15 03:35:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update AbstractController.php

Browse Source
This commit is contained in:
刀刀
2021-06-16 09:56:41 +08:00
committed by GitHub
parent f4c429ea28
commit 9abd51cc6b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/base-utils/src/Scaffold/Controller/AbstractController.php
View File

@@ -208,7 +208,7 @@ abstract class AbstractController extends Controller
$order_by = $sortColumn . ' ' . $sortType;
}
if (empty($conditions) && !($this->options['defaultList'] ?? true)) {
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options','group_by');
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options', 'group_by');
}
if (method_exists($this, 'beforeListQuery')) {
$hook_params = get_class_method_params_name($this, 'beforeListQuery');
@@ -220,7 +220,7 @@ abstract class AbstractController extends Controller
$this->beforeListQuery($conditions, $order_by, $group_by, $columns);
}
}
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options','group_by');
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options', 'group_by');
}
/**
@@ -238,7 +238,6 @@ abstract class AbstractController extends Controller
$group_by
] = array_values($this->makeWhere());
$entity = $this->getEntity();
// $count = $entity->count($conditions);
if ($group_by) {
$entity->getModel()->groupBy($group_by);
$count_query = clone $entity;