diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 6ad4f058..e0040a96 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -414,7 +414,7 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) { $routes->post("logined", "RestAuthenticationController::logined"); $routes->post("getId", "RestAuthenticationController::getUserIdFromToken"); }); - +// $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy"); $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData"); diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index 06c39c7f..44e387e2 100755 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -153,6 +153,8 @@ class EmployeeModel extends Model ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id') ->join('policy_type', 'policy_type.id = client_policy.policy_type_id') ->where('client_policy.policy_status', 1) + ->where('employee_polices.status !=', 'truncated') + ->where('employee_polices.is_active', 1) ->where('employee_polices.employee_id', $id) ->get() ->getResult();