weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: weiz:282a18dfc5baa1e852bcc866be794e30ba46fbb5
Branches Tags
weiz:master
weiz:dev
weiz:preview
weiz:zhangwei
weiz:yaooo
..
compare: weiz:ddc10275a51a4b4d997fa850172fc9bba6320a2f
Branches Tags
weiz:dev
weiz:master
weiz:preview
weiz:zhangwei
weiz:yaooo

No commits in common. "282a18dfc5baa1e852bcc866be794e30ba46fbb5" and "ddc10275a51a4b4d997fa850172fc9bba6320a2f" have entirely different histories.
282a18dfc5 ... ddc10275a5

1 changed files with 0 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
app/api/controller/IndexController.php
View File

@ -47,7 +47,6 @@ class IndexController extends BaseApiController
$productDevice = ProductDevice::where('product_id',$landProduct['product_id'])->findOrEmpty(); $productDevice = ProductDevice::where('product_id',$landProduct['product_id'])->findOrEmpty();
$device = Device::where('id', $productDevice['device_id'])->findOrEmpty(); $device = Device::where('id', $productDevice['device_id'])->findOrEmpty();
$data['video_url'] = $device['video_url']; $data['video_url'] = $device['video_url'];
$data['device_id'] = $device['id'];
$landCollection = LandCollection::where('land_id',$params['land_id'])->order('id desc')->findOrEmpty(); $landCollection = LandCollection::where('land_id',$params['land_id'])->order('id desc')->findOrEmpty();
if($landCollection->isEmpty()){ if($landCollection->isEmpty()){
$data['monitor'] = []; $data['monitor'] = [];