Commit f717e20300c5de5f7d531e31e0dede9a441d2633
1 parent
3568bee8
test
Showing
1 changed file
with
1 additions
and
6 deletions
Show diff stats
common/models/TeamSearch.php
| ... | ... | @@ -149,7 +149,7 @@ |
| 149 | 149 | // grid filtering conditions |
| 150 | 150 | $query->andFilterWhere([ |
| 151 | 151 | 'team_id' => $this->team_id, |
| 152 | - 'department_id' => $this->department_id, | |
| 152 | + 'team.department_id' => $this->department, | |
| 153 | 153 | 'date_add' => $this->date_add, |
| 154 | 154 | 'user_add_id' => $this->user_add_id, |
| 155 | 155 | ]); |
| ... | ... | @@ -218,11 +218,6 @@ |
| 218 | 218 | 'LOWER(middlename)', |
| 219 | 219 | mb_strtolower($this->user), |
| 220 | 220 | ], |
| 221 | - ]) | |
| 222 | - ->andFilterWhere([ | |
| 223 | - 'like', | |
| 224 | - 'LOWER(department.name)', | |
| 225 | - mb_strtolower($this->department), | |
| 226 | 221 | ]); |
| 227 | 222 | |
| 228 | 223 | return $dataProvider; | ... | ... |