From 332c412d0f0c08fa1d953cc5c030e028c833c507 Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 2 Jan 2026 17:56:13 +0530 Subject: [PATCH 1/2] FIX_WELLNESS_ONBOARD_GET_NOT_ONBOARDED_COUNT_QUERY_ISSUE --- app/Controllers/EmployeeController.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index d394de03..118b5330 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -3323,15 +3323,18 @@ class EmployeeController extends AdminController ->where('employee_polices.wellness_onboard', '0') ->where('emp.emp_status', 'active') ->where('emp.is_active', 1) - ->where('cp.wellness_plan_id is not null',null,false) - ->where('cp.wellness_plan_id !=',"") - ->where('cp.wellness_plan_id !=',0) - - ->where('cp.wellness_vendor_id is null') - ->where('cp.wellness_vendor_id !=',0) - ->where('cp.wellness_vendor_id !=',"") - // ->where('cp.policy_status',1) - // ->where('cp.is_active',1) + ->groupStart() + ->where('cp.wellness_plan_id IS NOT NULL', null, false) + ->orWhere('cp.wellness_plan_id !=', '') + ->orWhere('cp.wellness_plan_id !=', 0) + ->groupEnd() + ->groupStart() + ->where('cp.wellness_vendor_id IS NULL', null, false) + ->orWhere('cp.wellness_vendor_id =', '') + ->orWhere('cp.wellness_vendor_id =', 0) + ->groupEnd() + ->where('cp.policy_status',1) + ->where('cp.is_active',1) ->findAll(); // echo count($data);die(); // if(is_array($data) && count($data)) From 85017b002ea07255447807bb07e7f8684dee8063 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Sat, 3 Jan 2026 16:06:21 +0530 Subject: [PATCH 2/2] GWM : acm name not display issue --- app/Controllers/ThzController.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php index 0d152a31..a2427b07 100644 --- a/app/Controllers/ThzController.php +++ b/app/Controllers/ThzController.php @@ -234,8 +234,24 @@ class ThzController extends BaseController ->where('thz_master.thz_id', $thz_id) ->findAll(); + $clientId = $result['master'][0]['client_id']; + + $accManagerId = $this->getAcmIdUsingClientId($clientId ?? null); + + $accManager = $this->userModel->find($accManagerId); + if (!empty($result['master'])) { $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType); + $accManagerName = $accManager['first_name'] ?? ''; + + foreach ($notes as &$note) { + + if (empty($note['name'])) { + $note['name'] = $accManagerName; + } + } + + unset($note); $result['notes'] = !empty($notes) ? $notes : []; } else { $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));