|
@@ -98,7 +98,6 @@ class PersonWorkService extends Service
|
|
|
$map = Employee::whereIn('id', $id)->select('title','id','number')->get()->toArray();
|
|
$map = Employee::whereIn('id', $id)->select('title','id','number')->get()->toArray();
|
|
|
$map = array_column($map,null,'id');
|
|
$map = array_column($map,null,'id');
|
|
|
|
|
|
|
|
- $unit = [];
|
|
|
|
|
foreach ($data as $key => $value){
|
|
foreach ($data as $key => $value){
|
|
|
$tmp = $map[$value['employee_id']] ?? [];
|
|
$tmp = $map[$value['employee_id']] ?? [];
|
|
|
$merge = [];
|
|
$merge = [];
|
|
@@ -110,7 +109,7 @@ class PersonWorkService extends Service
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$detail = [
|
|
$detail = [
|
|
|
- 'details' => $unit,
|
|
|
|
|
|
|
+ 'details' => $data,
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
foreach ($detail as $key => $value) {
|
|
foreach ($detail as $key => $value) {
|
