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

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

@@ -37,7 +37,7 @@ class CorporateMemberController extends Controller
             // ->where('corporate_id', $corporate_id)
             ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
             ->select(
-                'members.*', // Select all columns from the members table
+                'members.*, members.id AS membersid', // Select all columns from the members table
                 DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names')
             )
             ->whereHas('employeds', function ($employeds) use ($corporate_id) {
@@ -60,7 +60,7 @@ class CorporateMemberController extends Controller
                     ]);
                 }
             ])
-            ->groupBy('members.id','members.person_id','members.user_id')
+            ->groupBy('membersid')
             ->paginate()
             ->appends($request->all());
         return Helper::paginateResources(MemberDataTableResource::collection($members));