Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging
This commit is contained in:
@@ -35,14 +35,6 @@ class CorporateMemberController extends Controller
|
|||||||
$members = Member::query()
|
$members = Member::query()
|
||||||
->filter($request->all())
|
->filter($request->all())
|
||||||
// ->where('corporate_id', $corporate_id)
|
// ->where('corporate_id', $corporate_id)
|
||||||
->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
|
|
||||||
->select(
|
|
||||||
'members.*', // 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) {
|
|
||||||
$employeds->where('corporate_id', $corporate_id);
|
|
||||||
})
|
|
||||||
->with([
|
->with([
|
||||||
'employeds',
|
'employeds',
|
||||||
'currentPolicy',
|
'currentPolicy',
|
||||||
|
|||||||
Reference in New Issue
Block a user