FIX_GMC_TWO_POLICY
This commit is contained in:
parent
7c2716bfe1
commit
dabe60b498
@ -1437,12 +1437,14 @@ class EmployeeRestController extends AdminController
|
|||||||
if($checkGmcParentsPolicyExist)
|
if($checkGmcParentsPolicyExist)
|
||||||
{
|
{
|
||||||
$GmcParrentsData = $this->getGmcParrentsPolicy($checkGmcParentsPolicyExist,$emp_code,$client_id,$client_branch_id);
|
$GmcParrentsData = $this->getGmcParrentsPolicy($checkGmcParentsPolicyExist,$emp_code,$client_id,$client_branch_id);
|
||||||
return $this->respond(['status' => 'success','code' => 200,'data' => [$array,$GmcParrentsData]], 200);
|
// return $this->respond(['status' => 'success','code' => 200,'data' => [$array,$GmcParrentsData]], 200);
|
||||||
|
$result[] = $array;
|
||||||
|
$result[] = $GmcParrentsData;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->request->getGet('policy') == 'GMC'){
|
if($this->request->getGet('policy') == 'GMC'){
|
||||||
return $this->respond(['status' => 'success','code' => 200,'data' => [$array]], 200);
|
// return $this->respond(['status' => 'success','code' => 200,'data' => [$array]], 200);
|
||||||
|
$result[] = $array;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1450,7 +1452,11 @@ class EmployeeRestController extends AdminController
|
|||||||
// $result[] = $array;
|
// $result[] = $array;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->respond(['status' => 'success','code' => 200,'data' => []], 200);
|
if(!empty($result) && $this->request->getGet('policy') == 'GMC'){
|
||||||
|
return $this->respond(['status' => 'success','code' => 200,'data' => $result], 200);
|
||||||
|
}else{
|
||||||
|
return $this->respond(['status' => 'success','code' => 200,'data' => []], 200);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user