From: Alexander Smirnov Date: Wed, 27 Mar 2024 09:43:38 +0000 (+0300) Subject: fix if X-Git-Tag: 1.1~162^2~12 X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=688838a3dffcc347e83a61e587d25867f4831e38;p=erp24_rep%2Fyii-erp24%2F.git fix if --- diff --git a/erp24/forms/timetable/TabelSearchForm.php b/erp24/forms/timetable/TabelSearchForm.php index 2fe34611..c51e7fc4 100755 --- a/erp24/forms/timetable/TabelSearchForm.php +++ b/erp24/forms/timetable/TabelSearchForm.php @@ -88,10 +88,10 @@ class TabelSearchForm extends Model 'group_id' => array_keys(AdminGroup::groupsWithShift()) ]) ->andFilterWhere(['group_id' => $this->adminGroupId]) - ->orderBy(['IF(group_id IN (' + ->orderBy(['CASE WHEN group_id IN (' . AdminGroup::GROUP_WORKERS . ', ' . AdminGroup::GROUP_WORKERS_ARCHIVE . ', ' - . AdminGroup::GROUP_FIRED . '),1,0)' => SORT_ASC, 'group_id' => SORT_ASC, 'name' => SORT_ASC]) + . AdminGroup::GROUP_FIRED . ') THEN 1 ELSE 0 END' => SORT_ASC, 'group_id' => SORT_ASC, 'name' => SORT_ASC]) ->indexBy('id'); if ($this->storeId) { $adminQuery