Fix Member Import

2022-07-25 11:59:11 +07:00
parent 1edd8157c7
commit d7de76798e
8 changed files with 121 additions and 14 deletions
--- a/Modules/Internal/Http/Controllers/Api/MemberController.php
+++ b/Modules/Internal/Http/Controllers/Api/MemberController.php
@@ -29,9 +29,17 @@ class MemberController extends Controller
        $benefits = Member::query()
                    ->filter($request->all())
                // ->where('corporate_id', $corporate_id)
-                    ->whereHas('employeds', function ($query) use ($corporate_id) {
-                        $query->where('corporate_id', $corporate_id);
+                    ->whereHas('employeds', function ($employeds) use ($corporate_id) {
+                        $employeds->where('corporate_id', $corporate_id);
                    })
+                    ->with([
+                        'employeds', 
+                        'currentPolicy' => function ($policy) use ($corporate_id) {
+                            $policy->whereHas('corporatePolicy', function($corporatePolicy) use ($corporate_id) {
+                                $corporatePolicy->where('corporate_id', $corporate_id);
+                            });
+                        }
+                    ])
                    ->paginate(20)
                    ->appends($request->all());