Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging
This commit is contained in:
@@ -37,8 +37,9 @@ class CorporateMemberController extends Controller
|
|||||||
// ->where('corporate_id', $corporate_id)
|
// ->where('corporate_id', $corporate_id)
|
||||||
->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
|
->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
|
||||||
->select(
|
->select(
|
||||||
'members.*, members.id AS membersid', // Select all columns from the members table
|
'members.*', // Select all columns from the members table
|
||||||
DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names')
|
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) {
|
->whereHas('employeds', function ($employeds) use ($corporate_id) {
|
||||||
$employeds->where('corporate_id', $corporate_id);
|
$employeds->where('corporate_id', $corporate_id);
|
||||||
|
|||||||
Reference in New Issue
Block a user