@@ -18,7 +18,7 @@ |
||
| 18 | 18 | $condition = array_merge($condition, $property->getValue($obj)); |
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | - if($obj->hasAttribute($obj->removedAttribute)) |
|
| 21 | + if ($obj->hasAttribute($obj->removedAttribute)) |
|
| 22 | 22 | return (new \sibds\behaviors\TrashQuery($obj))->findRemoved()->andFilterWhere($condition); |
| 23 | 23 | else |
| 24 | 24 | return parent::find()->andFilterWhere($condition); |
@@ -18,9 +18,10 @@ |
||
| 18 | 18 | $condition = array_merge($condition, $property->getValue($obj)); |
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | - if($obj->hasAttribute($obj->removedAttribute)) |
|
| 22 | - return (new \sibds\behaviors\TrashQuery($obj))->findRemoved()->andFilterWhere($condition); |
|
| 23 | - else |
|
| 24 | - return parent::find()->andFilterWhere($condition); |
|
| 21 | + if($obj->hasAttribute($obj->removedAttribute)) { |
|
| 22 | + return (new \sibds\behaviors\TrashQuery($obj))->findRemoved()->andFilterWhere($condition); |
|
| 23 | + } else { |
|
| 24 | + return parent::find()->andFilterWhere($condition); |
|
| 25 | + } |
|
| 25 | 26 | } |
| 26 | 27 | } |