diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php index adc0834..f2656c1 100755 --- a/app/Http/Controllers/Admin/StatisticsController.php +++ b/app/Http/Controllers/Admin/StatisticsController.php @@ -399,11 +399,12 @@ class StatisticsController extends CommonController } })->where('admin_id', $user->id)->pluck('area_id'); } - $data = Area::where(function ($query) use ($areaId) { + $data = Area::with('project', 'building')->where(function ($query) use ($areaId) { if ($areaId) { $query->whereIn('id', $areaId); } - })->get(); + })->paginate(10); + dd($data->toArray()); return view($this->bladePath . ".huli", compact("data")); } diff --git a/app/Models/Product.php b/app/Models/Product.php index f3876c3..37b64ae 100755 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Auth; class Product extends SoftDeletesModel { protected $table = "product"; - + protected static function booted() { static::addGlobalScope(new AdminProjectScope());