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