From: marina Date: Thu, 25 Apr 2024 14:57:54 +0000 (+0300) Subject: выправлен фильтр на странице /timetable/plan X-Git-Tag: 1.1~102^2 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1ee7343338608749aef37f5e01d011b29e2a3f31;p=erp24_rep%2Fyii-erp24%2F.git выправлен фильтр на странице /timetable/plan --- diff --git a/erp24/forms/timetable/TabelSearchForm.php b/erp24/forms/timetable/TabelSearchForm.php index c51e7fc4..77716c20 100755 --- a/erp24/forms/timetable/TabelSearchForm.php +++ b/erp24/forms/timetable/TabelSearchForm.php @@ -93,10 +93,9 @@ class TabelSearchForm extends Model . AdminGroup::GROUP_WORKERS_ARCHIVE . ', ' . AdminGroup::GROUP_FIRED . ') THEN 1 ELSE 0 END' => SORT_ASC, 'group_id' => SORT_ASC, 'name' => SORT_ASC]) ->indexBy('id'); - if ($this->storeId) { - $adminQuery - ->andWhere(new Expression('FIND_IN_SET(:store_id, store_arr)', ['store_id' => (int) $this->storeId])); - } + + $adminQuery->andFilterWhere(['store_id' => $this->storeId]); + return $adminQuery->all(); }