正在显示
2 个修改的文件
包含
6 行增加
和
12 行删除
@@ -2,7 +2,6 @@ | @@ -2,7 +2,6 @@ | ||
2 | 2 | ||
3 | namespace app\api\controller; | 3 | namespace app\api\controller; |
4 | 4 | ||
5 | -use app\api\model\School; | ||
6 | use app\common\controller\Api; | 5 | use app\common\controller\Api; |
7 | 6 | ||
8 | /** | 7 | /** |
@@ -52,15 +51,12 @@ class Activity extends Api | @@ -52,15 +51,12 @@ class Activity extends Api | ||
52 | if (empty($id)) { | 51 | if (empty($id)) { |
53 | $this->error('参数错误', ['status' => 3]); | 52 | $this->error('参数错误', ['status' => 3]); |
54 | } | 53 | } |
55 | - $data = db('school s') | ||
56 | - ->join('activity a','a.id = s.activity_id') | ||
57 | - ->where('s.activity_id', $id) | ||
58 | - ->field('s.*,a.title as activity_name') | ||
59 | - ->paginate(10,false) | ||
60 | - ->each(function ($item,$key){ | ||
61 | - $item['createtime'] = date('Y-m-d',$item['createtime']); | ||
62 | - return $item; | ||
63 | - }); | 54 | + $data = db('campus c') |
55 | + ->join('activity a','a.id = c.activity_id') | ||
56 | + ->join('school s','s.id = c.school_id') | ||
57 | + ->where('c.activity_id', $id) | ||
58 | + ->field('c.*,a.title as activity_name,s.title as school_name') | ||
59 | + ->paginate(10,false); | ||
64 | if (empty($data)) { | 60 | if (empty($data)) { |
65 | $this->error('空空', ['status' => 3]); | 61 | $this->error('空空', ['status' => 3]); |
66 | } | 62 | } |
-
请 注册 或 登录 后发表评论