Skip to content

R
ruer_cms
Commit b6c44cec authored by 蔡闯's avatar 蔡闯
Browse files
Options

2021-6-25

parent 972de477
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
app/admin/controller/Company.php
View file @ b6c44cec
...@@ -57,7 +57,6 @@ class Company extends Base ...@@ -57,7 +57,6 @@ class Company extends Base
} else { } else {
$res['content'] = []; $res['content'] = [];
} }
return $this->returnJson($res); return $this->returnJson($res);
} }
......
app/wechatapi/controller/Company.php
View file @ b6c44cec
...@@ -38,7 +38,11 @@ class Company extends BaseController ...@@ -38,7 +38,11 @@ class Company extends BaseController
public function getBusInfo() public function getBusInfo()
{ {
$res = Db::name('bus')->where(['id'=>1])->find(); $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); return $this->returnJson($res);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment