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

Compare commits

base: weiz:3d6dd82a74e19723f1758a54a015ebf1e6547b37
Branches Tags
weiz:master
weiz:dev
weiz:preview
weiz:zhangwei
weiz:yaooo
..
compare: weiz:03d9af555d211c518af1dcef07303163adf84653
Branches Tags
weiz:dev
weiz:master
weiz:preview
weiz:zhangwei
weiz:yaooo

No commits in common. "3d6dd82a74e19723f1758a54a015ebf1e6547b37" and "03d9af555d211c518af1dcef07303163adf84653" have entirely different histories.
3d6dd82a74 ... 03d9af555d

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

2
app/api/controller/ActionController.php
View File

@ -113,7 +113,7 @@
if(empty($params['plant_id']) || empty($params['type'])){ if(empty($params['plant_id']) || empty($params['type'])){
return $this->fail('缺少必要参数'); return $this->fail('缺少必要参数');
} }
$data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->order('create_time desc')->select()->each(function($item){ $data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->select()->each(function($item){
$item['detail'] = json_decode($item['detail'],true); $item['detail'] = json_decode($item['detail'],true);
return $item; return $item;
})->toArray(); })->toArray();