bugs fix alarm center

2024-01-06 15:48:06 +07:00
parent ae9a1f70fc
commit ed10e2ad4a
2 changed files with 8 additions and 4 deletions
--- a/app/Services/CorporateMemberService.php
+++ b/app/Services/CorporateMemberService.php
@@ -149,10 +149,10 @@ class CorporateMemberService
                });
            })
            ->when($request->input('start_date'), function (Builder $query, $start) {
-                $query->where('member_plans.start', '>=', $start);
+                $query->where('members_effective_date.start', '>=', $start);
            })
            ->when($request->input('end_date'), function (Builder $query, $end) {
-                $query->where('member_plans.end', '<', $end);
+                $query->where('members_expire_date.end', '<', $end);
            })
            ->when($request->input('division'), function (Builder $query, $value) {
                $query->where('corporate_employees.division_id', $value);