diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 44ddf180..84ed0c24 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -247,22 +247,33 @@ if (!function_exists('data_group_by_family')) function data_group_by_family($emp_data,$data_source = 'excel') { $result = []; + // dd($emp_data); foreach ($emp_data as $rkey => $row) { if($data_source == 'excel') { if(!check_row_is_empty_or_null($row)) { - $result[$row[1]][] = $row; + if(strtolower($row[5]) == 'self' && isset($result[$row[1]])) + { + array_unshift($result[$row[1]],$row); + }else + { + $result[$row[1]][] = $row; + } } - }else if($data_source = 'db') { - $result[$row['emp_code']][] = $row; + if(strtolower($row['relationship']) == 'self' && isset($result[$row['emp_code']])) + { + array_unshift($result[$row['emp_code']],$row); + }else + { + $result[$row['emp_code']][] = $row; + } } } - return $result; } }