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

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

@@ -37,8 +37,9 @@ class CorporateMemberController extends Controller
             // ->where('corporate_id', $corporate_id)
             ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
             ->select(
-                'members.*, members.id AS membersid', // Select all columns from the members table
-                DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names')
+                'members.*', // Select all columns from the members table
+                DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names'),
+                'members.id AS membersid' // Include members.id as membersid
             )
             ->whereHas('employeds', function ($employeds) use ($corporate_id) {
                 $employeds->where('corporate_id', $corporate_id);