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

Modules/Internal/Http/Controllers/Api/CorporateMemberController.php

@@ -35,8 +35,13 @@ class CorporateMemberController extends Controller
         $members = Member::query()
             ->filter($request->all())
             // ->where('corporate_id', $corporate_id)
+            ->select('members.*')
+            ->selectSub(function ($query) {
+                $query->selectRaw('GROUP_CONCAT(files_mcu.original_name)')->from('files_mcu')
+                      ->whereRaw('files_mcu.memberid = members.id');
+            }, 'original_names')
             ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
-            ->selectRaw('members.*, GROUP_CONCAT(files_mcu.original_name) AS original_names')
+            ->groupBy('members.id')
             ->with([
                 'employeds',
                 'currentPolicy',
@@ -54,7 +59,6 @@ class CorporateMemberController extends Controller
                     ]);
                 }
             ])
-            ->groupBy('members.id')
             ->paginate()
             ->appends($request->all());
         return Helper::paginateResources(MemberDataTableResource::collection($members));