FIX_CHANGE_GMC_PARANTS
This commit is contained in:
parent
16df4424c8
commit
fdd1b3dea9
@ -1515,11 +1515,11 @@ class EmployeeRestController extends AdminController
|
||||
public function getGmcParrentsPolicy($GmcParrentsPolicy,$emp_code,$client_id,$client_branch_id)
|
||||
{
|
||||
|
||||
$employeeData = $this->employeeModel->where('emp_code',$emp_code)
|
||||
->where('client_id',$client_id)
|
||||
->where('client_branch_id',$client_branch_id)
|
||||
->where('is_active', 1 )
|
||||
->where('is_addon_value',0)->findAll();
|
||||
// $employeeData = $this->employeeModel->where('emp_code',$emp_code)
|
||||
// ->where('client_id',$client_id)
|
||||
// ->where('client_branch_id',$client_branch_id)
|
||||
// ->where('is_active', 1 )
|
||||
// ->where('is_addon_value',0)->findAll();
|
||||
// return $employeeData;
|
||||
foreach ($GmcParrentsPolicy as $key => $array) {
|
||||
|
||||
@ -1528,8 +1528,18 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
|
||||
// Reset employee array
|
||||
$empData = $employeeData;
|
||||
|
||||
// $empData = $employeeData;
|
||||
$empData = $this->employeeModel
|
||||
->select('employees.*')
|
||||
->join('employee_polices', 'employee_polices.employee_id = employees.id')
|
||||
->where('employees.emp_code',$emp_code)
|
||||
->where('employees.client_id',$client_id)
|
||||
->where('employees.client_branch_id',$client_branch_id)
|
||||
->where('employee_polices.client_policy_id',$array->ClientPolicyId)
|
||||
->where('employees.is_active', 1 )
|
||||
->where('employee_polices.is_active', 1 )
|
||||
->where('employees.is_addon_value',0)
|
||||
->findAll();
|
||||
|
||||
$array->Policy_Terms = json_decode($array->Policy_Terms);
|
||||
|
||||
@ -1543,6 +1553,7 @@ class EmployeeRestController extends AdminController
|
||||
->join('employee_polices', 'employee_polices.employee_id = employees.id')
|
||||
->where('employees.emp_code',$emp_code)
|
||||
->where('employees.is_active',1)
|
||||
->where('employee_polices.is_active',1)
|
||||
->where('employee_polices.client_policy_id',$array->ClientPolicyId)
|
||||
->get()
|
||||
->getResult();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user