From cb29ab302ab732e5bf2e7ba6d688e587fe830e07 Mon Sep 17 00:00:00 2001 From: denghy Date: Mon, 6 Jan 2020 22:21:46 +0800 Subject: [PATCH] ksort --- app/Domains/Virtual/Services/PropertyService.php | 8 ++++---- .../foundation/src/Database/DatabaseServiceProvider.php | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Domains/Virtual/Services/PropertyService.php b/app/Domains/Virtual/Services/PropertyService.php index 09a589eb..7ba135a4 100644 --- a/app/Domains/Virtual/Services/PropertyService.php +++ b/app/Domains/Virtual/Services/PropertyService.php @@ -187,10 +187,10 @@ class PropertyService extends Service return $item->company_id . '_' . $item->package_id; })->toArray(); - $actives = app(OrderCardPartitionRepository::class)->selectRaw('company_id, package_id, count(*) as counts') - ->withConditions(['type' => 0, 'card_status' => 2])->groupBy(['company_id', 'package_id'])->get()->keyBy(function ($item) { - return $item->company_id . '_' . $item->package_id; - })->toArray(); + // $actives = app(OrderCardPartitionRepository::class)->selectRaw('company_id, package_id, count(*) as counts') + // ->withConditions(['type' => 0, 'card_status' => 2])->groupBy(['company_id', 'package_id'])->get()->keyBy(function ($item) { + // return $item->company_id . '_' . $item->package_id; + // })->toArray(); $carrierOperators = app(Dicts::class)->get('carrier_operator'); diff --git a/vendor/dipper/foundation/src/Database/DatabaseServiceProvider.php b/vendor/dipper/foundation/src/Database/DatabaseServiceProvider.php index f6de0330..df06441d 100644 --- a/vendor/dipper/foundation/src/Database/DatabaseServiceProvider.php +++ b/vendor/dipper/foundation/src/Database/DatabaseServiceProvider.php @@ -188,6 +188,7 @@ class DatabaseServiceProvider extends ServiceProvider $values = [$values]; } else { foreach ($values as $key => $value) { + ksort($value); $values[$key] = $value; } }