|
@@ -27,7 +27,7 @@ class GroupController extends BaseController
|
|
|
$pagesize = isset($params['pagesize']) ? intval($params['pagesize']) : 10;
|
|
$pagesize = isset($params['pagesize']) ? intval($params['pagesize']) : 10;
|
|
|
|
|
|
|
|
$groupModel = new GroupModel();
|
|
$groupModel = new GroupModel();
|
|
|
- $query = $groupModel->order('gr_id ASC');
|
|
|
|
|
|
|
+ $query = $groupModel->with('user')->order('gr_id ASC');
|
|
|
|
|
|
|
|
if (!empty($title)) {
|
|
if (!empty($title)) {
|
|
|
$query->whereLike('title', '%' . $title . '%');
|
|
$query->whereLike('title', '%' . $title . '%');
|
|
@@ -38,17 +38,7 @@ class GroupController extends BaseController
|
|
|
'list_rows' => $pagesize,
|
|
'list_rows' => $pagesize,
|
|
|
]);
|
|
]);
|
|
|
|
|
|
|
|
- $data = [];
|
|
|
|
|
- foreach ($list->items() as $item) {
|
|
|
|
|
- $uname = $item->user ? $item->user->uname : ''; // 判断讲师信息是否存在
|
|
|
|
|
- $data[] = [
|
|
|
|
|
- 'id' => $item['id'],
|
|
|
|
|
- 'title' => $item['title'],
|
|
|
|
|
- 'uname' => $uname,
|
|
|
|
|
- ];
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- return app('json')->success($data);
|
|
|
|
|
|
|
+ return app('json')->success($list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|