...
|
...
|
@@ -2,7 +2,6 @@ |
|
|
|
|
|
namespace app\api\controller;
|
|
|
|
|
|
use app\api\model\School;
|
|
|
use app\common\controller\Api;
|
|
|
|
|
|
/**
|
...
|
...
|
@@ -52,15 +51,12 @@ class Activity extends Api |
|
|
if (empty($id)) {
|
|
|
$this->error('参数错误', ['status' => 3]);
|
|
|
}
|
|
|
$data = db('school s')
|
|
|
->join('activity a','a.id = s.activity_id')
|
|
|
->where('s.activity_id', $id)
|
|
|
->field('s.*,a.title as activity_name')
|
|
|
->paginate(10,false)
|
|
|
->each(function ($item,$key){
|
|
|
$item['createtime'] = date('Y-m-d',$item['createtime']);
|
|
|
return $item;
|
|
|
});
|
|
|
$data = db('campus c')
|
|
|
->join('activity a','a.id = c.activity_id')
|
|
|
->join('school s','s.id = c.school_id')
|
|
|
->where('c.activity_id', $id)
|
|
|
->field('c.*,a.title as activity_name,s.title as school_name')
|
|
|
->paginate(10,false);
|
|
|
if (empty($data)) {
|
|
|
$this->error('空空', ['status' => 3]);
|
|
|
}
|
...
|
...
|
|