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

bugs fix

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-25 13:27:42 +07:00
parent d0b8c25b7d
commit 453ff3ec90
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,7 @@ class CorporateMemberController extends Controller
}) })
->select('members.*') ->select('members.*')
->selectRaw('(SELECT GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ") AS file_mcu_names from files_mcu WHERE files_mcu.memberid = members.id) AS file_mcu_names') ->selectRaw('(SELECT GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ") AS file_mcu_names from files_mcu WHERE files_mcu.memberid = members.id) AS file_mcu_names')
->groupBy('corporate_employees.member_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

@@ -967,7 +967,7 @@ class MemberEnrollmentService
// Bisa disini penyebab data dobel // Bisa disini penyebab data dobel
$member->employeds()->updateOrCreate([ $member->employeds()->updateOrCreate([
'division_id' => $division_id 'member_id' => $member->id
],[ ],[
'corporate_id' => $corporate->id, 'corporate_id' => $corporate->id,
'branch_code' => $row['branch_code'], 'branch_code' => $row['branch_code'],