|
...
|
...
|
@@ -206,9 +206,12 @@ class Activity extends Api |
|
|
|
])
|
|
|
|
->find();
|
|
|
|
$model = new ItemDetails();
|
|
|
|
$list = $model->where('item_id',$id)->find()->toArray();
|
|
|
|
$res = db('study')->where('user_id',$user['id'])->find();
|
|
|
|
if ($list['team_id'] == $res['team_id']){
|
|
|
|
if (empty($res)){
|
|
|
|
$list = $model->where(['item_id'=>$id])->find()->toArray();
|
|
|
|
$data['images'] = $list['images'];
|
|
|
|
}else{
|
|
|
|
$list = $model->where(['item_id'=>$id,'team_id'=>$res['team_id']])->find()->toArray();
|
|
|
|
$data['images'] = $list['images'];
|
|
|
|
}
|
|
|
|
$data['holdtime'] = date('Y-m-d',$data['holdtime']);
|
...
|
...
|
|
