diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 68520460..2b3032b2 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -35,6 +35,10 @@ class CorporateMemberController extends Controller $members = Member::query() ->filter($request->all()) // ->where('corporate_id', $corporate_id) + ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') + ->select( + 'members.*, GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names' + ) ->with([ 'employeds', 'currentPolicy', @@ -52,6 +56,7 @@ class CorporateMemberController extends Controller ]); } ]) + ->groupBy('members.id') ->paginate() ->appends($request->all()); return Helper::paginateResources(MemberDataTableResource::collection($members)); diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index c78d516a..2b12a7ab 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -829,7 +829,7 @@ class MemberEnrollmentService } $memberPolicy->member->save(); - + $member->save(); // update informasi person $person = Person::query() ->where('id', $member->person_id)