diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 2b3032b2..3b360ce5 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -34,11 +34,15 @@ class CorporateMemberController extends Controller { $members = Member::query() ->filter($request->all()) - // ->where('corporate_id', $corporate_id) + ->where('corporate_employees.corporate_id', $corporate_id) + ->select('members.*') + ->selectSub(function ($query) { + $query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")') + ->from('files_mcu') + ->whereRaw('files_mcu.memberid = members.id'); + }, 'file_mcu_names') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') - ->select( - 'members.*, GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names' - ) + ->leftJoin('corporate_employees', 'members.id', '=', 'corporate_employees.member_id') ->with([ 'employeds', 'currentPolicy', @@ -56,7 +60,6 @@ class CorporateMemberController extends Controller ]); } ]) - ->groupBy('members.id') ->paginate() ->appends($request->all()); return Helper::paginateResources(MemberDataTableResource::collection($members));