diff --git a/app/Admin/Controllers/v3/GoodsActivityReportController.php b/app/Admin/Controllers/v3/GoodsActivityReportController.php index ead085f..0b5241a 100644 --- a/app/Admin/Controllers/v3/GoodsActivityReportController.php +++ b/app/Admin/Controllers/v3/GoodsActivityReportController.php @@ -160,15 +160,16 @@ class GoodsActivityReportController extends AdminController */ public function export(Request $request) { + $this->marketId = Auth::getMarket(); $params = [ 'page' => request()->input('page', 1), 'name' => request()->input('name', ''), - 'market_id' => request()->input('market_id',0), + 'market_id' => $this->marketId ? $this->marketId : request()->input('market_id',0), 'store_id' => request()->input('store_id',0), 'start_time' => request()->input('start_time',''), 'end_time' => request()->input('end_time',''), ]; - + $name = date('Y-m-d-His',time()); $data = new \App\Admin\Actions\Exporter\GoodsActivitySales($params); if(empty($data)){