diff --git a/app/Http/Controllers/Admin/ProjectController.php b/app/Http/Controllers/Admin/ProjectController.php index 096469a..c316f41 100755 --- a/app/Http/Controllers/Admin/ProjectController.php +++ b/app/Http/Controllers/Admin/ProjectController.php @@ -331,7 +331,7 @@ class ProjectController extends CommonController $sheet->getColumnDimension('D')->setWidth(60); $sheet->getColumnDimension('E')->setWidth(20); $sheet->getColumnDimension('F')->setWidth(20); - + $count = count($data); //计算有多少条数据 for ($i = 2; $i <= $count + 1; $i++) { $content = ''; diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index 5a794b7..f648f51 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -418,7 +418,10 @@ class StatisticsController extends CommonController $item->lies = $this->getLies($bedIds, $productItem, $factor, $month); } // 获取所有列 - $lie = array_column($data[0]->lies, 'name'); + $lie = []; + if(isset($data[0]->lies)){ + $lie = array_column($data[0]->lies, 'name'); + } $months = $this->_getMonths(); return view($this->bladePath . ".huli", compact("sumOrderTotal","data", "month", "lie", "projects", "project_id"));