Update HlElement.php

Исправлена формирование карты полей
areal-team · Dec 18, 2018 · abf44ce · abf44ce
1 parent 7f678c7
commit abf44ce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Element/HlElement.php b/src/Element/HlElement.php
@@ -121,9 +121,6 @@ private function getMapFields(array $userFields)
         $result = $this->fieldsBase;
         foreach ($userFields as $field) {
             $alias = \Akop\Util::camelize(substr($field["FIELD_NAME"], 3));
-            if (!in_array($alias, $this->fieldsIgnore) && !in_array($fieldName, $this->fieldsIgnore)) {
-                $result[$alias] = $fieldName;
-            }
             switch ($field["USER_TYPE_ID"]) {
                 case "hlblock":
                     $result = array_merge(
@@ -133,6 +130,9 @@ private function getMapFields(array $userFields)
                     $alias .= "Id";
                     break;
                 default:
+                    if (!in_array($alias, $this->fieldsIgnore) && !in_array($fieldName, $this->fieldsIgnore)) {
+                        $result[$alias] = $fieldName;
+                    }
                     break;
             }
             $result[$alias] = $field["FIELD_NAME"];