正在显示
2 个修改的文件
包含
6 行增加
和
0 行删除
@@ -38,6 +38,7 @@ class Student extends Api | @@ -38,6 +38,7 @@ class Student extends Api | ||
38 | * @ApiParams (name="type", type="integer", required=false, description="1高中同校 2高中同市 3高中同省") | 38 | * @ApiParams (name="type", type="integer", required=false, description="1高中同校 2高中同市 3高中同省") |
39 | * @ApiParams (name="university_id", type="integer", required=false, description="大学ID") | 39 | * @ApiParams (name="university_id", type="integer", required=false, description="大学ID") |
40 | * @ApiParams (name="graduated_id", type="integer", required=false, description="专业ID") | 40 | * @ApiParams (name="graduated_id", type="integer", required=false, description="专业ID") |
41 | + * @ApiParams (name="college_id", type="integer", required=false, description="学院ID") | ||
41 | * @ApiParams (name="up_id", type="integer", required=false, description="升学方式ID") | 42 | * @ApiParams (name="up_id", type="integer", required=false, description="升学方式ID") |
42 | * @ApiParams (name="word", type="string", required=false, description="学长姓名") | 43 | * @ApiParams (name="word", type="string", required=false, description="学长姓名") |
43 | * @ApiReturnParams (name="code", type="integer", required=true, sample="0") | 44 | * @ApiReturnParams (name="code", type="integer", required=true, sample="0") |
@@ -88,6 +89,7 @@ class Student extends Api | @@ -88,6 +89,7 @@ class Student extends Api | ||
88 | $universityId = $this->request->param('university_id', 0, 'int'); | 89 | $universityId = $this->request->param('university_id', 0, 'int'); |
89 | $word = $this->request->param('word', '', 'string'); | 90 | $word = $this->request->param('word', '', 'string'); |
90 | $graduatedId = $this->request->param('graduated_id', 0, 'int'); | 91 | $graduatedId = $this->request->param('graduated_id', 0, 'int'); |
92 | + $collegeId = $this->request->param('college_id', 0, 'int'); | ||
91 | $upId = $this->request->param('up_id', 0, 'int'); | 93 | $upId = $this->request->param('up_id', 0, 'int'); |
92 | 94 | ||
93 | $where['show_switch'] = ['=', 1]; | 95 | $where['show_switch'] = ['=', 1]; |
@@ -139,6 +141,10 @@ class Student extends Api | @@ -139,6 +141,10 @@ class Student extends Api | ||
139 | $where['graduated_id'] = ['=', $graduatedId]; | 141 | $where['graduated_id'] = ['=', $graduatedId]; |
140 | } | 142 | } |
141 | 143 | ||
144 | + if($collegeId) { | ||
145 | + $where['college_id'] = ['=', $collegeId]; | ||
146 | + } | ||
147 | + | ||
142 | if($upId) { | 148 | if($upId) { |
143 | $where['up_id'] = ['=', $upId]; | 149 | $where['up_id'] = ['=', $upId]; |
144 | } | 150 | } |
此 diff 太大无法显示。
-
请 注册 或 登录 后发表评论