diff --git a/app/admin/logic/ActivityZoneFormLogic.php b/app/admin/logic/ActivityZoneFormLogic.php index 5f76614ac..56a1c1700 100644 --- a/app/admin/logic/ActivityZoneFormLogic.php +++ b/app/admin/logic/ActivityZoneFormLogic.php @@ -130,7 +130,7 @@ class ActivityZoneFormLogic extends BaseLogic $unit = reset_index($unit, 'id'); foreach ($products as &$item) { $item['unit_name'] = $unit[$item['unit']]['name'] ?? ''; - unset($item['unit'], $item['product_id']); + unset($item['unit'], $item['id']); } $data = ConfigLogic::getDictByType('activity_zone'); foreach ($data['activity_zone'] as $value) { diff --git a/app/common/service/xlsx/ActivityZoneService.php b/app/common/service/xlsx/ActivityZoneService.php index c936df080..53a0b178f 100644 --- a/app/common/service/xlsx/ActivityZoneService.php +++ b/app/common/service/xlsx/ActivityZoneService.php @@ -68,7 +68,7 @@ class ActivityZoneService foreach ($data as $k => $v) { $column = $k + 7; $sheet->mergeCells("B{$column}:C{$column}"); - $sheet->setCellValue('A' . ($k + 7), $v['id']); + $sheet->setCellValue('A' . ($k + 7), $v['product_id']); $sheet->setCellValue("B{$column}", $v['store_name']); $sheet->setCellValue("D{$column}", $v['unit_name']); }