diff --git a/app/admin/traits/Curd.php b/app/admin/traits/Curd.php index 86af9d0..3987b41 100644 --- a/app/admin/traits/Curd.php +++ b/app/admin/traits/Curd.php @@ -24,14 +24,16 @@ trait Curd if (input('selectFields')) { return $this->selectList(); } - list($page, $limit, $where) = $this->buildTableParames(); + list($page, $limit, $where, $excludes, $request_options, $group) = $this->buildTableParames(); $count = $this->model ->where($where) + ->group($group) ->count(); $list = $this->model ->where($where) ->page($page, $limit) ->order($this->sort) + ->group($group) ->select(); $data = [ 'code' => 0, diff --git a/app/common/controller/AdminController.php b/app/common/controller/AdminController.php index b40008f..7ec8204 100644 --- a/app/common/controller/AdminController.php +++ b/app/common/controller/AdminController.php @@ -209,6 +209,7 @@ class AdminController extends BaseController $get = $this->request->get('', null, null); $page = isset($get['page']) && !empty($get['page']) ? $get['page'] : 1; $limit = isset($get['limit']) && !empty($get['limit']) ? $get['limit'] : 15; + $group = isset($get['group']) && !empty($get['group']) ? $get['group'] : null; $filters = isset($get['filter']) && !empty($get['filter']) ? $get['filter'] : '{}'; $ops = isset($get['op']) && !empty($get['op']) ? $get['op'] : '{}'; // json转数组 @@ -277,7 +278,7 @@ class AdminController extends BaseController $where[] = [$key, $op, "%{$val}"]; } } - return [$page, $limit, $where, $excludes, $request_options]; + return [$page, $limit, $where, $excludes, $request_options, $group]; } /** diff --git a/public/static/plugs/lay-module/tableData/tableData.html b/public/static/plugs/lay-module/tableData/tableData.html index 687c130..2a59265 100644 --- a/public/static/plugs/lay-module/tableData/tableData.html +++ b/public/static/plugs/lay-module/tableData/tableData.html @@ -4,7 +4,7 @@