diff --git a/frontend/models/SearchPerformerForm.php b/frontend/models/SearchPerformerForm.php index 679ed56..6ad1d82 100644 --- a/frontend/models/SearchPerformerForm.php +++ b/frontend/models/SearchPerformerForm.php @@ -168,48 +168,54 @@ class SearchPerformerForm extends Model ]); } - foreach($this->working_conditions as $working_conditions){ - if($working_conditions=='guarantee'){ - $query->andWhere([ - '<>', - 'user_info.guarantee', - '' - ]); - }else if($working_conditions=='prepayment'){ - $query->andWhere([ - 'user_info.prepayment'=>0, - - ]); - }else { - $query->andFilterWhere([ - 'user_info.'.$working_conditions => 1, - ]); - } - - } - foreach($this->additional_parameters as $additional_parameters){ - - switch ($additional_parameters) { - case 'with_portfolio': - $query->andFilterWhere([ - 'user.id'=>ArrayHelper::toArray(Portfolio::find()->select('user_id')->column()), + if(!empty($this->working_conditions)){ + foreach($this->working_conditions as $working_conditions){ + if($working_conditions=='guarantee'){ + $query->andWhere([ + '<>', + 'user_info.guarantee', + '' ]); - break; - case 'with_comments': - $query->andFilterWhere([ - 'user.id'=>ArrayHelper::toArray(Portfolio::find()->select('user_id')->column()), + }else if($working_conditions=='prepayment'){ + $query->andWhere([ + 'user_info.prepayment'=>0, + ]); - break; - case 'only_free': + }else { $query->andFilterWhere([ - 'user_info.busy'=>0, + 'user_info.'.$working_conditions => 1, ]); - break; + } + + } + } + if(!empty($this->additional_parameters)){ + foreach($this->additional_parameters as $additional_parameters){ + + switch ($additional_parameters) { + case 'with_portfolio': + $query->andFilterWhere([ + 'user.id'=>ArrayHelper::toArray(Portfolio::find()->select('user_id')->column()), + ]); + break; + case 'with_comments': + $query->andFilterWhere([ + 'user.id'=>ArrayHelper::toArray(Portfolio::find()->select('user_id')->column()), + ]); + break; + case 'only_free': + $query->andFilterWhere([ + 'user_info.busy'=>0, + ]); + break; + } } } + + if(!empty( $this->search)){ $query->andFilterWhere([ -- libgit2 0.21.4