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:35:29 +07:00
parent ebf2dc8c0f af9864d89f
commit bc1c209b07
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,10 @@ class CorporateMemberController extends Controller
$members = Member::query() $members = Member::query()
->filter($request->all()) ->filter($request->all())
// ->where('corporate_id', $corporate_id) // ->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([ ->with([
'employeds', 'employeds',
'currentPolicy', 'currentPolicy',
@@ -52,6 +56,7 @@ 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));

2
Modules/Internal/Services/MemberEnrollmentService.php
View File

@@ -829,7 +829,7 @@ class MemberEnrollmentService
} }
$memberPolicy->member->save(); $memberPolicy->member->save();
$member->save();
// update informasi person // update informasi person
$person = Person::query() $person = Person::query()
->where('id', $member->person_id) ->where('id', $member->person_id)