diff --git a/admin/src/app/api/classroom.ts b/admin/src/app/api/classroom.ts index 89028d70..5dc3aa8f 100644 --- a/admin/src/app/api/classroom.ts +++ b/admin/src/app/api/classroom.ts @@ -63,4 +63,7 @@ export function getWithPersonnelList(params: Record) { return request.get('classroom/personnel_all', { params }) } +export function getAllClassroomList() { + return request.get('classroom/classroom_all') +} // USER_CODE_END -- class diff --git a/niucloud/app/adminapi/controller/classroom/Classroom.php b/niucloud/app/adminapi/controller/classroom/Classroom.php index 65b139ad..34ad1e96 100644 --- a/niucloud/app/adminapi/controller/classroom/Classroom.php +++ b/niucloud/app/adminapi/controller/classroom/Classroom.php @@ -110,4 +110,8 @@ class Classroom extends BaseAdminController return success(( new ClassroomService())->getPersonnelAll()); } + public function classroom_all() + { + return success(( new ClassroomService())->classroom_all()); + } } diff --git a/niucloud/app/adminapi/route/classroom.php b/niucloud/app/adminapi/route/classroom.php index aecb0010..00cf5d89 100644 --- a/niucloud/app/adminapi/route/classroom.php +++ b/niucloud/app/adminapi/route/classroom.php @@ -33,6 +33,8 @@ Route::group('classroom', function () { Route::get('personnel_all','classroom.Classroom/getPersonnelAll'); + Route::get('classroom_all','classroom.Classroom/classroom_all'); + })->middleware([ AdminCheckToken::class, AdminCheckRole::class, diff --git a/niucloud/app/service/admin/classroom/ClassroomService.php b/niucloud/app/service/admin/classroom/ClassroomService.php index 985ee723..e3822fc5 100644 --- a/niucloud/app/service/admin/classroom/ClassroomService.php +++ b/niucloud/app/service/admin/classroom/ClassroomService.php @@ -108,5 +108,11 @@ class ClassroomService extends BaseAdminService return $personnelModel->select()->toArray(); } + public function classroom_all() + { + $data = $this->model->where('status', 1)->order('sort_order desc')->select()->toArray(); + return $data; + } + }