FIX_issue
This commit is contained in:
parent
5dd1964f25
commit
361a1e058b
@ -4617,14 +4617,18 @@ class EmployeeRestController extends AdminController
|
|||||||
$responce = $employeeController->employeesUplodWithEvents($post_data);
|
$responce = $employeeController->employeesUplodWithEvents($post_data);
|
||||||
// print_r($responce); die;
|
// print_r($responce); die;
|
||||||
|
|
||||||
if($responce['status']){
|
$file_data = $this->getDataFromHrFilesTable(['hr_id' => $responce['created_by']]);
|
||||||
$file_data = $this->getDataFromHrFilesTable(['file_id' => $responce['file_id']]);
|
|
||||||
$responce['data'] = $file_data;
|
$responce['data'] = $file_data;
|
||||||
return $responce;
|
return $responce;
|
||||||
}else{
|
|
||||||
$responce['data'] = [];
|
// if(isset($responce['file_id'])){
|
||||||
return $responce;
|
// $file_data = $this->getDataFromHrFilesTable(['hr_id' => $responce['created_by']]);
|
||||||
}
|
// $responce['data'] = $file_data;
|
||||||
|
// return $responce;
|
||||||
|
// }else{
|
||||||
|
// $responce['data'] = [];
|
||||||
|
// return $responce;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
private function giveNotificationToClientsAccountManager($data)
|
private function giveNotificationToClientsAccountManager($data)
|
||||||
@ -4952,6 +4956,10 @@ class EmployeeRestController extends AdminController
|
|||||||
$builder->where("files.id", $search_data['file_id']);
|
$builder->where("files.id", $search_data['file_id']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($search_data['hr_id']) && !empty($search_data['hr_id'])) {
|
||||||
|
$builder->where("files.hr_id", $search_data['hr_id']);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Execute query
|
// Execute query
|
||||||
$data = $builder->get()->getResultArray();
|
$data = $builder->get()->getResultArray();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user