|
@@ -109,7 +109,7 @@ class DeviceService extends Service
|
|
|
$map = array_column($map,null,'id');
|
|
$map = array_column($map,null,'id');
|
|
|
|
|
|
|
|
foreach ($data as $key => $value){
|
|
foreach ($data as $key => $value){
|
|
|
- $tmp = $map[$value['main_id']] ?? [];
|
|
|
|
|
|
|
+ $tmp = $map[$value['depart_id']] ?? [];
|
|
|
$merge = [];
|
|
$merge = [];
|
|
|
$merge['depart_title'] = $tmp['title'];
|
|
$merge['depart_title'] = $tmp['title'];
|
|
|
$merge['depart_code'] = $tmp['code'];
|
|
$merge['depart_code'] = $tmp['code'];
|
