|
...
|
...
|
@@ -156,14 +156,8 @@ class Activity extends Api |
|
|
|
if (empty($rid)) {
|
|
|
|
$this->error('参数错误', ['status' => 2]);
|
|
|
|
}
|
|
|
|
$data = db('item i')
|
|
|
|
->join('ronda r','r.id = i.ronda_id')
|
|
|
|
->join('campus c','r.campus_id = c.id')
|
|
|
|
->field('i.*,c.title as campus_title')
|
|
|
|
->where([
|
|
|
|
'i.ronda_id' => $rid
|
|
|
|
])
|
|
|
|
->paginate(10,false);
|
|
|
|
$model = new Item();
|
|
|
|
$data = collection($model->whereIn('ronda_ids',$rid)->select())->toArray();
|
|
|
|
$this->success('获取项目列表成功', $data);
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|
