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

Compare commits

base: weiz:36a8aea0fc2b5a5442d5f752fa87b6a9f5c7be51
Branches Tags
weiz:master
weiz:dev
weiz:preview
weiz:zhangwei
weiz:yaooo
..
compare: weiz:ea4a0b92477e45aa2dc11d32d31fa10f1dd13914
Branches Tags
weiz:dev
weiz:master
weiz:preview
weiz:zhangwei
weiz:yaooo

No commits in common. "36a8aea0fc2b5a5442d5f752fa87b6a9f5c7be51" and "ea4a0b92477e45aa2dc11d32d31fa10f1dd13914" have entirely different histories.
36a8aea0fc ... ea4a0b9247

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

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

@ -113,10 +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'])->select()->each(function($item){ $data = Action::where('plant_id',$params['plant_id'])->where('type',$params['type'])->select()->toArray();
$item['detail'] = json_decode($item['detail'],true);
return $item;
})->toArray();
return $this->success('请求成功',$data); return $this->success('请求成功',$data);
} }
} }