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-27 09:32:57 +07:00
parent 055b0d234d cb7e0bb484
commit 0eaae544d1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ 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.*') ->select('members.*')
->selectSub(function ($query) { ->selectSub(function ($query) {
$query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")') $query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")')
@@ -42,6 +42,7 @@ class CorporateMemberController extends Controller
->whereRaw('files_mcu.memberid = members.id'); ->whereRaw('files_mcu.memberid = members.id');
}, 'file_mcu_names') }, 'file_mcu_names')
->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
->leftJoin('corporate_employees', 'members.id', '=', 'corporate_employees.member_id')
->with([ ->with([
'employeds', 'employeds',
'currentPolicy', 'currentPolicy',