From a9eaf24d8e230f4e1f662bd4fe1277ed153e2392 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Tue, 27 Jan 2026 14:26:12 +0530 Subject: [PATCH 1/3] FIX_LIVE_ISSUE --- app/Controllers/EmployeeRestController.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index ee4a9ca..d8ffc24 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -4470,21 +4470,22 @@ class EmployeeRestController extends AdminController ") ->join('employee_polices', 'employees.id = employee_polices.employee_id') ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id') + ->whereIn('employees.emp_status', ['draft', 'enrolled']) + ->whereIn('employee_polices.status', ['draft', 'enrolled']) ->where([ 'employees.is_active' => 1, - 'employees.emp_status' => 'draft', - 'employee_polices.status' => 'draft', 'employee_polices.is_active' => 1, 'client_policy.policy_type_id' => 2, 'employees.family_floater_key' => 'self', - 'employees.emp_code' => $emp_code, - 'employees.client_id' => $client_id, - 'employees.client_branch_id' => $client_branch_id, + 'employees.emp_code' => $emp_code ?? null, + 'employees.client_id' => $client_id ?? null, + 'employees.client_branch_id' => $client_branch_id ?? null, ]) + ->orderBy('employee_polices.id', 'desc') ->first(); // dd($data); - // dd( db_connect()->getLastQuery()); + // dd(db_connect()->getLastQuery()); if (!empty($data) && !empty($data['gmc_parent_policy_id'])) { From 80a90ade1678bc377065c54ce9875ece14efaa9e Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 27 Jan 2026 14:39:43 +0530 Subject: [PATCH 2/3] Clinet_id md5 changes : GWM --- app/Controllers/RestAuthenticationController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 4afe047..89ec1de 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -798,6 +798,7 @@ class RestAuthenticationController extends AdminController $decoded = json_decode($HRAccessData['allowed_modules'], true); $getAllhrData[$key]['allowed_modules'] = $decoded; $HRAccessData['pre_client_id'] = md5($HRAccessData['pre_client_id']); + $HRAccessData['post_client_id'] = md5($HRAccessData['post_client_id']); $token = JWTToken::encode($HRAccessData); $getAllhrData[$key]['token'] = $token; From 3eaaf1cede00ad2a0947e9e32b64d5dd205368a3 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 27 Jan 2026 15:24:29 +0530 Subject: [PATCH 3/3] getEmployeePolicy api change : GWM --- app/Models/EmployeePolicyModel.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 306e6ee..72b8ba9 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -163,8 +163,10 @@ class EmployeePolicyModel extends Model ->orderBy('employee_polices.employee_id', 'ASC'); - // Conditionally add where clauses - if ($client_id != 0 && !empty($client_id)) { + // Conditionally add where clauses + if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) { + $result->where('MD5(emp.client_id)', $client_id); + } else if ($client_id != 0 && !empty($client_id)) { $result->where('emp.client_id', $client_id); } if ($branch_id != 0 && !empty($branch_id)) {