2021-6-25

972de477 · 蔡闯 · 805a2a2e · 972de477
Commit 972de477 authored Jun 25, 2021 by 蔡闯
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

app/admin/controller/Company.php app/admin/controller/Company.php +6 -1

No files found.
--- a/app/admin/controller/Company.php
+++ b/app/admin/controller/Company.php
@@ -52,7 +52,12 @@ class Company extends Base
    public function getBusInfo()
    {
        $res = Db::name('bus')->where(['id'=>1])->find();
-        $res['content'] = json_decode($res['content'],true);
+        if($res['content']) {
+            $res['content'] = json_decode($res['content'],true);
+        } else {
+            $res['content'] = [];
+        }
+
        return $this->returnJson($res);

    }