FIX_Dashboard staff null removed
This commit is contained in:
parent
7ac5001a4f
commit
7381d19e3d
@ -139,6 +139,7 @@ class DashboardController extends ResourceController
|
|||||||
->where('pe.manager_id', $manager_id)
|
->where('pe.manager_id', $manager_id)
|
||||||
->where('pe.is_active', 1)
|
->where('pe.is_active', 1)
|
||||||
->where('pe.assigned_to IS NOT NULL')
|
->where('pe.assigned_to IS NOT NULL')
|
||||||
|
->where('ps.name IS NOT NULL')
|
||||||
->where('pe.assigned_to !=', 0)
|
->where('pe.assigned_to !=', 0)
|
||||||
->groupBy('pe.assigned_to')
|
->groupBy('pe.assigned_to')
|
||||||
->orderBy('ps.name', 'ASC')
|
->orderBy('ps.name', 'ASC')
|
||||||
@ -224,9 +225,7 @@ class DashboardController extends ResourceController
|
|||||||
|
|
||||||
// ->where('ps.handler_id', $handler_id)
|
// ->where('ps.handler_id', $handler_id)
|
||||||
->where('pe.is_active', 1)
|
->where('pe.is_active', 1)
|
||||||
->where('ps.is_active', 1)
|
|
||||||
->where('pe.assigned_to IS NOT NULL')
|
->where('pe.assigned_to IS NOT NULL')
|
||||||
->where('ps.name IS NOT NULL')
|
|
||||||
->where('pe.assigned_to !=', 0)
|
->where('pe.assigned_to !=', 0)
|
||||||
->groupBy('pe.assigned_to')
|
->groupBy('pe.assigned_to')
|
||||||
->orderBy('ps.name', 'ASC')
|
->orderBy('ps.name', 'ASC')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user