tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging'

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-07-27 09:45:54 +07:00
parent 396c05a4d2 cb7e0bb484
commit 0a8a8c94f3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -34,11 +34,15 @@ class CorporateMemberController extends Controller
{ {
$members = Member::query() $members = Member::query()
->filter($request->all()) ->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') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
->select( ->leftJoin('corporate_employees', 'members.id', '=', 'corporate_employees.member_id')
'members.*, GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names'
)
->with([ ->with([
'employeds', 'employeds',
'currentPolicy', 'currentPolicy',
@@ -56,7 +60,6 @@ class CorporateMemberController extends Controller
]); ]);
} }
]) ])
->groupBy('members.id')
->paginate() ->paginate()
->appends($request->all()); ->appends($request->all());
return Helper::paginateResources(MemberDataTableResource::collection($members)); return Helper::paginateResources(MemberDataTableResource::collection($members));