From 7c8e80abfeedfb4d886c5be8cc5eb357f4304763 Mon Sep 17 00:00:00 2001 From: exbatek Date: Tue, 3 Nov 2020 15:57:18 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B4=D0=B2=D0=B0=20=D0=BF=D1=80=D0=BE=D0=BF?= =?UTF-8?q?=D1=83=D1=89=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BD=D0=B4=D0=B0=D1=80=D1=82=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8F=20WORK=5FLOGO=20=D0=B8=20PERSONAL=5FSTREET?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Queries/UserQuery.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Queries/UserQuery.php b/src/Queries/UserQuery.php index a453015..83d4454 100644 --- a/src/Queries/UserQuery.php +++ b/src/Queries/UserQuery.php @@ -83,6 +83,8 @@ class UserQuery extends OldCoreQuery 'PASSWORD', 'CHECKWORD', 'LID', + 'WORK_LOGO', + 'PERSONAL_STREET', ]; /** @@ -96,24 +98,24 @@ protected function loadModels() $sort = $this->sort; $filter = $this->normalizeFilter(); $params = [ - 'SELECT' => $this->propsMustBeSelected() ? ['UF_*'] : ($this->normalizeUfSelect() ?: false), + 'SELECT' => $this->propsMustBeSelected() ? ['UF_*'] : ($this->normalizeUfSelect() ?: false), 'NAV_PARAMS' => $this->navigation, - 'FIELDS' => $this->normalizeSelect(), + 'FIELDS' => $this->normalizeSelect(), ]; $selectGroups = $this->groupsMustBeSelected(); $keyBy = $this->keyBy; - $callback = function() use ($sort, $filter, $params, $selectGroups){ + $callback = function () use ($sort, $filter, $params, $selectGroups) { $users = []; $rsUsers = $this->bxObject->getList($sort, $sortOrder = false, $filter, $params); while ($arUser = $this->performFetchUsingSelectedMethod($rsUsers)) { if ($selectGroups) { $arUser['GROUP_ID'] = $this->bxObject->getUserGroup($arUser['ID']); } - + $this->addItemToResultsUsingKeyBy($users, new $this->modelName($arUser['ID'], $arUser)); } - + return new Collection($users); }; @@ -161,8 +163,8 @@ public function count() $queryType = 'UserQuery::count'; $filter = $this->normalizeFilter(); - $callback = function() use ($filter) { - return (int) $this->bxObject->getList($order = 'ID', $by = 'ASC', $filter, [ + $callback = function () use ($filter) { + return (int)$this->bxObject->getList($order = 'ID', $by = 'ASC', $filter, [ 'NAV_PARAMS' => [ 'nTopCount' => 0, ], @@ -222,7 +224,7 @@ protected function normalizeUfSelect() { return preg_grep('/^(UF_+)/', $this->select); } - + protected function prepareMultiFilter(&$key, &$value) { $value = join(' | ', $value);