From 2e5dc0a9ea6050ec8f5f9aea4cb767323ac8bcea Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 9 Feb 2023 11:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/CityDataController.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/CityDataController.php b/app/Http/Controllers/CityDataController.php
index 1ae1fce..7c42e8b 100644
--- a/app/Http/Controllers/CityDataController.php
+++ b/app/Http/Controllers/CityDataController.php
@@ -16,7 +16,7 @@ class CityDataController extends Controller
      */
     public function statistics()
     {
-        $settings = Setting::where('slug', 'like', 'city_data_%')->get()->toArray();
+        $settings = Setting::where('slug', 'like', 'city_data_%')->orderBy('created_at', 'asc')->get()->toArray();
 
         return $this->json(array_map(function ($item) {
             $_value = json_decode($item['value']);
@@ -41,7 +41,12 @@ class CityDataController extends Controller
                 'city_data_chart_lingye', 
                 'city_data_chart_activity'
             ])){
-                Setting::where('slug', $key)->update(['value'=>json_encode($value)]);
+                if(!empty($value)){
+                    $value = json_encode($value);
+                }else{
+                    $value = '{}';
+                }
+                Setting::where('slug', $key)->update(['value'=>$value]);
             }else{//更新全市基础数据
                 if(Setting::where('slug', $key)->exists()){
                     Setting::where('slug', $key)->update(['value->value'=>$value]);