|
|
@@ -27,7 +27,7 @@ class GroupController extends BaseController
|
|
|
$pagesize = isset($params['pagesize']) ? intval($params['pagesize']) : 10;
|
|
|
|
|
|
$groupModel = new GroupModel();
|
|
|
- $query = $groupModel->with('user')->order('gr_id ASC');
|
|
|
+ $query = $groupModel->order('gr_id ASC');
|
|
|
|
|
|
if (!empty($title)) {
|
|
|
$query->whereLike('title', '%' . $title . '%');
|
|
|
@@ -38,7 +38,14 @@ class GroupController extends BaseController
|
|
|
'list_rows' => $pagesize,
|
|
|
]);
|
|
|
|
|
|
- return app('json')->success($list);
|
|
|
+ $data = [
|
|
|
+ 'list' => $list->items(),
|
|
|
+ 'total' => $list->total(),
|
|
|
+ 'page' => $list->currentPage(),
|
|
|
+ 'pagesize' => $list->listRows(),
|
|
|
+ ];
|
|
|
+
|
|
|
+ return app('json')->success($data);
|
|
|
}
|
|
|
|
|
|
|