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

Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-07-26 17:23:24 +07:00
parent 6f1bba1c33 621ce08924
commit 40aab73ca0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ class CorporateMemberController extends Controller
// ->where('corporate_id', $corporate_id) // ->where('corporate_id', $corporate_id)
->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
->select( ->select(
'members.*', // Select all columns from the members table 'members.*, members.id AS membersid', // Select all columns from the members table
DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names') DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names')
) )
->whereHas('employeds', function ($employeds) use ($corporate_id) { ->whereHas('employeds', function ($employeds) use ($corporate_id) {
@@ -60,7 +60,7 @@ class CorporateMemberController extends Controller
]); ]);
} }
]) ])
->groupBy('members.id','members.person_id','members.user_id') ->groupBy('membersid')
->paginate() ->paginate()
->appends($request->all()); ->appends($request->all());
return Helper::paginateResources(MemberDataTableResource::collection($members)); return Helper::paginateResources(MemberDataTableResource::collection($members));