Merge remote-tracking branch 'origin/feature/SUPPORT-8938_tree' into develop

2025-02-28 11:10:27 +03:00 · 2025-02-28 11:10:27 +03:00 · 0a4555ecb5
commit 0a4555ecb5
parent 31cc1ffcff 3f07d692e4
21 changed files with 1015 additions and 307 deletions
--- a/backend/src/main/java/ru/micord/ervu/account_applications/component/field/persist/DropDownTree.java
+++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/field/persist/DropDownTree.java
@ -0,0 +1,29 @@
+package ru.micord.ervu.account_applications.component.field.persist;
+
+import component.field.dataconvert.DataConverter;
+import component.field.dataconvert.DataConverterProvider;
+import component.field.persist.AbstractGraphPersistComponent;
+import service.FormGraphSource;
+
+import ru.cg.webbpm.modules.database.bean.annotation.GraphSource;
+import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
+import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
+
+/**
+ * @author Adel Kalimullin
+ */
+public class DropDownTree extends AbstractGraphPersistComponent<Object, Object> {
+  @GraphSource(FormGraphSource.class)
+  @NotNull()
+  public EntityColumn columnForSave;
+
+  @Override
+  protected DataConverter<Object, Object> getDataConverter() {
+    return (DataConverter) DataConverterProvider.getDataConverter(columnForSave.getType());
+  }
+
+  @Override
+  public EntityColumn getEntityColumn() {
+    return columnForSave;
+  }
+}
--- a/backend/src/main/java/ru/micord/ervu/account_applications/component/model/TreeItemDto.java
+++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/model/TreeItemDto.java
@ -0,0 +1,22 @@
+package ru.micord.ervu.account_applications.component.model;
+
+import ru.cg.webbpm.modules.webkit.annotations.Model;
+
+/**
+ * @author r.latypov
+ */
+@Model
+public class TreeItemDto {
+  public Object id;
+  public Object parentId;
+  public String label;
+  public TreeItemDto[] children;
+  public Object businessId;
+  public String domainId;
+
+  public TreeItemDto(Object id, Object parentId, String label) {
+    this.id = id;
+    this.parentId = parentId;
+    this.label = label;
+  }
+}
--- a/backend/src/main/java/ru/micord/ervu/account_applications/component/rpc/TreeItemRpcService.java
+++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/rpc/TreeItemRpcService.java
@ -0,0 +1,24 @@
+package ru.micord.ervu.account_applications.component.rpc;
+
+import java.util.List;
+
+
+import ru.micord.ervu.account_applications.component.model.TreeItemDto;
+import ru.micord.ervu.account_applications.component.service.TreeItemService;
+
+import ru.cg.webbpm.modules.webkit.annotations.RpcCall;
+import ru.cg.webbpm.modules.webkit.annotations.RpcService;
+import ru.cg.webbpm.modules.webkit.beans.Behavior;
+
+/**
+ * @author r.latypov
+ */
+@RpcService
+public class TreeItemRpcService extends Behavior {
+  public TreeItemService treeItemService;
+
+  @RpcCall
+  public List<TreeItemDto> loadTreeData() {
+    return treeItemService.loadTreeData();
+  }
+}
--- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/TreeItemService.java
+++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/TreeItemService.java
@ -0,0 +1,120 @@
+package ru.micord.ervu.account_applications.component.service;
+
+import java.util.*;
+
+
+import database.dao.DefaultLoadDao;
+import org.springframework.stereotype.Service;
+import ru.micord.ervu.account_applications.component.model.TreeItemDto;
+import ru.micord.ervu.account_applications.component.rpc.TreeItemRpcService;
+
+import ru.cg.webbpm.modules.database.api.bean.TableRow;
+import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions;
+import ru.cg.webbpm.modules.database.bean.annotation.GraphSource;
+import ru.cg.webbpm.modules.database.bean.annotation.TypedColumn;
+import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
+import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumnType;
+import ru.cg.webbpm.modules.security.api.runtime.SecurityContext;
+import ru.cg.webbpm.modules.security.api.service.OrgUnitService;
+import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
+
+/**
+ * @author r.latypov
+ */
+@Service
+public class TreeItemService {
+  private final SecurityContext securityContext;
+  private final OrgUnitService orgUnitService;
+  @NotNull
+  public DefaultLoadDao loadDao;
+  @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
+  @NotNull
+  public EntityColumn idColumn;
+  @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
+  @NotNull
+  public EntityColumn parentIdColumn;
+  @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
+  @TypedColumn(colTypes = EntityColumnType.STRING)
+  @NotNull
+  public EntityColumn labelColumn;
+  @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
+  public EntityColumn businessIdColumn;
+  @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF)
+  public EntityColumn domainIdColumn;
+
+  public TreeItemService(SecurityContext securityContext, OrgUnitService orgUnitService) {
+    this.securityContext = securityContext;
+    this.orgUnitService = orgUnitService;
+  }
+
+  public List<TreeItemDto> loadTreeData() {
+    String currentOrgUnitCode = securityContext.getCurrentOrgUnitCode();
+    List<TreeItemDto> filteredTreeItems = loadTreeItems().stream()
+        .filter(item -> item.domainId.equalsIgnoreCase(currentOrgUnitCode))
+        .toList();
+    filteredTreeItems.forEach(this::setDomainIdToNull);
+    return filteredTreeItems;
+  }
+
+  private void setDomainIdToNull(TreeItemDto treeItem) {
+    treeItem.domainId = null;
+    TreeItemDto[] treeItemChildren = treeItem.children;
+    if (treeItemChildren != null && treeItemChildren.length > 0) {
+      for (TreeItemDto child : treeItemChildren) {
+        setDomainIdToNull(child);
+      }
+    }
+  }
+  
+  private List<TreeItemDto> loadTreeItems() {
+    List<TreeItemDto> loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream()
+        .map(this::toTreeItemDto)
+        .toList();
+
+    Map<Object, List<TreeItemDto>> childrenMap = new HashMap<>();
+    loadedList.forEach(item -> {
+      Object parentId = item.parentId;
+      if (parentId != null) {
+        List<TreeItemDto> listFromMap = childrenMap.computeIfAbsent(parentId,
+            k -> new ArrayList<>()
+        );
+        listFromMap.add(item);
+      }
+    });
+
+    loadedList.forEach(item -> {
+      List<TreeItemDto> children = childrenMap.get(item.id);
+      if (children != null) {
+        item.children = children.toArray(new TreeItemDto[0]);
+      }
+    });
+    return loadedList;
+  }
+
+  private Set<EntityColumn> getColumns() {
+    Set<EntityColumn> columnSet = new HashSet<>();
+    columnSet.add(idColumn);
+    columnSet.add(parentIdColumn);
+    columnSet.add(labelColumn);
+    if (businessIdColumn != null) {
+      columnSet.add(businessIdColumn);
+    }
+    if (domainIdColumn != null) {
+      columnSet.add(domainIdColumn);
+    }
+    return columnSet;
+  }
+
+  private TreeItemDto toTreeItemDto(TableRow tableRow) {
+    TreeItemDto treeItemDto = new TreeItemDto(
+        tableRow.get(idColumn), tableRow.get(parentIdColumn), (String) tableRow.get(labelColumn)
+    );
+    if (businessIdColumn != null) {
+      treeItemDto.businessId = tableRow.get(businessIdColumn);
+    }
+    if (domainIdColumn != null) {
+      treeItemDto.domainId = (String) tableRow.get(domainIdColumn);
+    }
+    return treeItemDto;
+  }
+}
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -4961,6 +4961,14 @@
        "tslib": "^1.9.0"
      }
    },
+    "ngx-treeview": {
+      "version": "10.0.2-micord.2",
+      "resolved": "https://repo.micord.ru/repository/npm-all/ngx-treeview/-/ngx-treeview-10.0.2-micord.2.tgz",
+      "integrity": "sha512-uFR3vJcaJ4gX/hCe5rZ0wH5rp66me4er8ZuD+IaIanW+2nbWRqGC0ueS5+MZWaxzfKhdukX8Z9qfSUoGSDBECg==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
    "nice-try": {
      "version": "1.0.5",
      "resolved": "https://repo.micord.ru/repository/npm-all/nice-try/-/nice-try-1.0.5.tgz",
--- a/frontend/package.json
+++ b/frontend/package.json
@ -52,6 +52,7 @@
    "ngx-cookie": "3.0.1",
    "ngx-international-phone-number": "1.0.6",
    "ngx-toastr": "10.2.0-cg",
+    "ngx-treeview": "10.0.2-micord.2",
    "popper.js": "1.14.7",
    "reflect-metadata": "0.1.13",
    "rxjs": "6.4.0",
--- a/frontend/src/resources/css/components-app.css
+++ b/frontend/src/resources/css/components-app.css
@ -1241,7 +1241,7 @@
    padding: 55px 20px 15px 20px;
 } 

-.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card i {
+.webbpm collapsible-panel:not(.grid-setting-panel):not(.column-states-panel):not(.filter-states-panel) .card i.fa {
    float: none;
    font-size: var(--size-text-secondary);
    margin-right: 6px;
--- a/frontend/src/resources/css/components-autority.css
+++ b/frontend/src/resources/css/components-autority.css
@ -157,6 +157,147 @@
    background-color: var(--input-bg);
 }

+/* DropDownTree start */
+.webbpm.account-applications dropdown-tree-view .form-group,
+.webbpm.account-applications dropdown-tree-view .dropdown {
+    display: flex;
+}
+.webbpm.account-applications dropdown-tree-view .form-group > label ~ div {
+    width: calc(100% - 160px); 
+}
+.webbpm.account-applications dropdown-tree-view .dropdown > button:not(:disabled):not(.disabled),
+.webbpm.account-applications dropdown-tree-view .dropdown > button:not(:disabled):not(.disabled):is(:focus, :active) {
+    font-family: 'Gilroy';
+    font-size: var(--size-text-secondary);
+    color: var(--color-text-primary);
+    text-align: left;
+    min-height: 32px;
+    width: 100%;
+    padding: 6px 24px 6px 8px;
+    border: 0;
+    border-bottom: 1px solid var(--input-border);
+    border-radius: var(--indent-xmini) var(--indent-xmini) 0 0;
+    background-color: var(--input-bg);
+    box-shadow: none;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;    
+}
+.webbpm.account-applications dropdown-tree-view .dropdown > button::after {
+    content: "\f282";
+    display: block;
+    position: absolute;    
+    color: var(--color-text-active);
+    font-family: bootstrap-icons !important;
+    font-weight: 800 !important;
+    font-size: var(--size-text-mini);
+    top: calc((50% - var(--size-text-secondary) / 2));
+    right: var(--indent-small);
+    height: auto;
+    width: auto;
+    border: 0;
+}
+.webbpm.account-applications dropdown-tree-view .dropdown.show > button::after {
+    top: calc(50% - (var(--size-text-secondary) + var(--indent-mini)) / 2);
+    transform: rotate(180deg);
+}
+.webbpm.account-applications dropdown-tree-view .dropdown-menu {
+    padding: 0;
+    border: 1px solid var(--btn-border);
+    border-radius: 8px;
+    background: var(--body-bg);
+    box-shadow: var(--btn-shadow);
+}
+.webbpm.account-applications dropdown-tree-view .dropdown-menu :is(.dropdown-container, .treeview-container) {
+    padding: 0;
+}
+.webbpm.account-applications dropdown-tree-view .dropdown-menu .treeview-container {
+    margin-bottom: var(--indent-base);
+    overflow-y: auto;
+}
+
+.webbpm.account-applications dropdown-tree-view .treeview-header .row-filter {
+    margin: var(--indent-base) var(--indent-xbase);
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header .row-filter > div {
+    padding: 0;
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header input {
+    color: var(--color-text-primary);
+    font-size: var(--size-text-secondary);
+    width: 100%;
+    min-height: 32px;
+    border: 0;
+    border-bottom: 1px solid var(--input-border);
+    border-radius: var(--indent-xmini) var(--indent-xmini) 0 0;
+    background-color: var(--input-bg);
+    box-shadow: none;
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header input::placeholder {
+    color: var(--color-text-mute);
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header input::-webkit-input-placeholder {
+    color: var(--color-text-primary);
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header input:-moz-placeholder {
+    color: var(--color-text-primary);
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header input::-moz-placeholder {
+    color: var(--color-text-primary);
+}
+.webbpm.account-applications dropdown-tree-view .treeview-header input:-ms-input-placeholder {
+    color: var(--color-text-primary);
+}
+.webbpm.account-applications dropdown-tree-view .row-filter {
+    position: relative;
+}
+.webbpm.account-applications dropdown-tree-view .row-filter::after {
+    content: "\f52a";
+    position: absolute;
+    color: var(--color-text-active);
+    font-family: bootstrap-icons !important;
+    font-weight: 800 !important;
+    font-size: var(--size-text-secondary);
+    top: calc(50% - (var(--size-text-secondary) + var(--indent-mini)) / 2);
+    right: var(--indent-xbase);
+}
+
+.webbpm.account-applications dropdown-tree-view .dropdown-divider {
+    margin: 0;
+    border-color: var(--btn-border);
+}
+.webbpm.account-applications dropdown-tree-view :is(.row-item, .treeview-text) {
+    color: var(--color-text-primary);
+    padding: var(--indent-mini) var(--indent-xbase);
+    border-bottom: 1px solid var(--btn-border);
+}
+.webbpm.account-applications dropdown-tree-view .row-item:is(:hover, :focus, :active) {
+    color: var(--color-text-active);
+}
+.webbpm.account-applications dropdown-tree-view ngx-treeview-item ngx-treeview-item .treeview-item {
+    padding-left: var(--indent-xbase);
+}
+.webbpm.account-applications dropdown-tree-view .row-item label {
+    font-size: var(--size-text-primary);
+    width: auto;
+    min-width: min(7.5vw, 9.375rem); /*150*/
+}
+.webbpm.account-applications dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill) {
+    margin-right: var(--indent-mini);
+}
+.webbpm.account-applications dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill)::before {
+    position: relative;
+    top: calc(var(--indent-xmini) / -4);
+    font-size: var(--size-text-secondary);
+}
+.webbpm.account-applications dropdown-tree-view .bi-caret-down-fill::before {
+    content: "\f2e9";
+}
+.webbpm.account-applications dropdown-tree-view .bi-caret-right-fill::before {
+    content: "\f4fd";
+}
+/* DropDownTree end */
+
 .webbpm.account-applications .selectize-dropdown, 
 .webbpm.account-applications .selectize-input, 
 .webbpm.account-applications .selectize-input input {
@ -253,7 +394,7 @@
    border: 1px solid var(--btn-border) !important;
    background-color: var(--panel-bg);
 }
-.webbpm.account-applications collapsible-panel .card i {
+.webbpm.account-applications collapsible-panel .card i.fa {
    display: none;
    width: 16px;
 }
@ -280,7 +421,6 @@
 }
 .webbpm.account-applications label {
    font-size: var(--size-text-mini);
-    text-transform: uppercase;
 }
 .webbpm.account-applications .width-full label {
    width: 160px;
--- a/frontend/src/resources/css/inbox-autority.css
+++ b/frontend/src/resources/css/inbox-autority.css
@ -31,7 +31,8 @@ body.webbpm.account-applications {
    --color-text-active: #107abc;
    --color-text-mute: rgba(2, 12, 18, 0.58);
    --color-link: #015e98;
-
+    --color-text-secondary: #b1daea;
+    --body-bg: #f8fbfc;
    --btn-border: rgba(1, 72, 116, 0.11);
    --btn-bg: rgba(25, 164, 233, 0.1);
    --btn-active-bg: linear-gradient(155deg, #1491cf 0%, #0f68a0 100%);
@ -40,8 +41,18 @@ body.webbpm.account-applications {
    --input-bg: rgba(219, 231, 242, 0.8);
    --input-border: rgba(53, 126, 172, 0.2);
    --panel-bg: rgba(53, 126, 172, 0.05);
-    --page-bg: rgba(38, 117, 166, 0.03); 
-
+    --page-bg: rgba(38, 117, 166, 0.03);
+    --bg-blur-40: blur(20px);
+    --bg-blur-20: blur(10px);
+    --bg-shadow: 4px 4px 2px 0 rgba(3, 20, 36, 0.4);
+    --color-primary-20: rgba(244, 252, 255, 0.2);
+    --color-primary-5: rgba(244, 252, 255, 0.05);
+    --color-success: #00db5d;
+    --color-error: #f91e11;
+    --color-dark: #070e1a;
+    --color-dark-20: rgba(7, 14, 26, 0.2);
+    --color-dark-40: rgba(7, 14, 26, 0.4);
+    --color-tooltip: rgba(8, 40, 59, 0.8);
    --size-text-header: 32px;
    --size-text-title: 24px;
    --size-text-subtitle: 18px;
@ -57,7 +68,11 @@ body.webbpm.account-applications {
    --indent-small: 12px;
    --indent-mini: 8px;
    --indent-xmini: 4px;
-
+    --color-success: #00db5d;
+    --color-dark-20: rgba(7, 14, 26, 0.2);
+    --w-content: calc((100vw - 300px)/100);
+    --indent-huge: min(calc(2.4*var(--w-content)), 3rem); /*48*/
+    --w-screen: min(calc(2*var(--w-content)), 2.5rem); /*40*/
    --h-header: 60px;
 }

--- a/frontend/src/resources/template/account_applications/component/external/ngx-treeview/dropdown-treeview-select.component.html
+++ b/frontend/src/resources/template/account_applications/component/external/ngx-treeview/dropdown-treeview-select.component.html
@ -0,0 +1,57 @@
+<ng-template #itemTemplate let-item="item" let-onCollapseExpand="onCollapseExpand"
+  let-onCheckedChange="onCheckedChange">
+  <div class="text-nowrap row-item">
+    <i *ngIf="item.children"
+       (click)="onCollapseExpand()"
+       aria-hidden="true"
+       [ngSwitch]="item.collapsed">
+      <i *ngSwitchCase="true" class="bi bi-caret-right-fill"></i>
+      <i *ngSwitchCase="false" class="bi bi-caret-down-fill"></i>
+    </i>
+    <label class="form-check-label" (click)="select(item)">{{ item.text }}</label>
+  </div>
+</ng-template>
+<ng-template #headerTemplate let-config="config" let-item="item"
+             let-onCollapseExpand="onCollapseExpand" let-onCheckedChange="onCheckedChange"
+             let-onFilterTextChange="onFilterTextChange">
+  <div *ngIf="config.hasFilter" class="row row-filter">
+      <input class="form-control" type="text"
+             [placeholder]="i18n.getFilterPlaceholder()"
+             [(ngModel)]="filterText"
+             (ngModelChange)="onFilterTextChange($event)" />
+  </div>
+  <div *ngIf="config.hasAllCheckBox || config.hasCollapseExpand" class="row">
+      <label *ngIf="config.hasAllCheckBox" (click)="select(item)">
+        <strong>{{ i18n.getAllCheckboxText() }}</strong>
+      </label>
+      <label *ngIf="config.hasCollapseExpand" class="float-right" (click)="onCollapseExpand()">
+        <i [title]="i18n.getTooltipCollapseExpandText(item.collapsed)" aria-hidden="true" [ngSwitch]="item.collapsed">
+          <svg *ngSwitchCase="true" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrows-angle-expand"
+            fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd"
+              d="M1.5 10.036a.5.5 0 0 1 .5.5v3.5h3.5a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" />
+            <path fill-rule="evenodd"
+              d="M6.354 9.646a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0zm8.5-8.5a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0z" />
+            <path fill-rule="evenodd"
+              d="M10.036 1.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 1 1-1 0V2h-3.5a.5.5 0 0 1-.5-.5z" />
+          </svg>
+          <svg *ngSwitchCase="false" width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrows-angle-contract"
+            fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path fill-rule="evenodd"
+              d="M9.5 2.036a.5.5 0 0 1 .5.5v3.5h3.5a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5v-4a.5.5 0 0 1 .5-.5z" />
+            <path fill-rule="evenodd"
+              d="M14.354 1.646a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 1 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0zm-7.5 7.5a.5.5 0 0 1 0 .708l-4.5 4.5a.5.5 0 0 1-.708-.708l4.5-4.5a.5.5 0 0 1 .708 0z" />
+            <path fill-rule="evenodd"
+              d="M2.036 9.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0V10h-3.5a.5.5 0 0 1-.5-.5z" />
+          </svg>
+        </i>
+      </label>
+  </div>
+  <div *ngIf="config.hasDivider" class="dropdown-divider"></div>
+</ng-template>
+<ngx-dropdown-treeview
+        [config]="config"
+        [headerTemplate]="headerTemplate"
+        [items]="items"
+        [itemTemplate]="itemTemplate">
+</ngx-dropdown-treeview>
--- a/frontend/src/resources/template/account_applications/component/field/DropdownTreeView.html
+++ b/frontend/src/resources/template/account_applications/component/field/DropdownTreeView.html
@ -0,0 +1,15 @@
+
+<div class="form-group">
+    <label [ngbTooltip]="tooltip | emptyIfNull"
+           [hidden]="!label" class="control-label">
+        <span>{{label}}<span *ngIf="isRequired()" class="alarm"> *</span></span>
+    </label>
+    <div>
+        <ngx-dropdown-treeview-select
+            [items]="items"
+            [maxHeight]="maxHeight"
+            [(value)]="value"
+            (valueChange)="onValueChange($event)">
+        </ngx-dropdown-treeview-select>
+    </div>
+</div>
--- a/frontend/src/ts/account_applications/component/enum/TreeValuesCacheStrategy.ts
+++ b/frontend/src/ts/account_applications/component/enum/TreeValuesCacheStrategy.ts
@ -0,0 +1,5 @@
+export enum TreeValuesCacheStrategy {
+  BY_PAGE_OBJECT_ID = "BY_PAGE_OBJECT_ID",
+  BY_OBJECT_NAME = "BY_OBJECT_NAME",
+  BY_CUSTOM_NAME = "BY_CUSTOM_NAME",
+}
--- a/frontend/src/ts/account_applications/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts
+++ b/frontend/src/ts/account_applications/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts
@ -0,0 +1,20 @@
+import {Injectable} from "@angular/core";
+import {DefaultTreeviewI18n, TreeviewItem, TreeviewSelection} from "ngx-treeview";
+
+
+@Injectable()
+export class DropdownTreeviewSelectI18n extends DefaultTreeviewI18n {
+    private internalSelectedItem: TreeviewItem;
+
+    set selectedItem(value: TreeviewItem) {
+        this.internalSelectedItem = value;
+    }
+
+    get selectedItem(): TreeviewItem {
+        return this.internalSelectedItem;
+    }
+
+    getText(selection: TreeviewSelection): string {
+        return this.internalSelectedItem ? this.internalSelectedItem.text : 'Элемент не выбран';
+    }
+}
--- a/frontend/src/ts/account_applications/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts
+++ b/frontend/src/ts/account_applications/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts
@ -0,0 +1,79 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  ViewChild
+} from '@angular/core';
+import {DropdownTreeviewSelectI18n} from './dropdown-treeview-select-i18n';
+import {
+  DropdownTreeviewComponent,
+  TreeviewConfig,
+  TreeviewHelper,
+  TreeviewI18n,
+  TreeviewItem
+} from "ngx-treeview";
+
+@Component({
+             moduleId: module.id,
+             selector: 'ngx-dropdown-treeview-select',
+             templateUrl: './../../../../../../../src/resources/template/account_applications/component/external/ngx-treeview/dropdown-treeview-select.component.html',
+             providers: [{provide: TreeviewI18n, useClass: DropdownTreeviewSelectI18n}],
+             changeDetection: ChangeDetectionStrategy.OnPush
+           })
+export class DropdownTreeviewSelectComponent implements OnChanges {
+  @Input() config: TreeviewConfig;
+  @Input() items: TreeviewItem[];
+  @Input() maxHeight: number;
+  @Input() value: any;
+  @Output() valueChange = new EventEmitter<any>();
+  @ViewChild(DropdownTreeviewComponent) dropdownTreeviewComponent: DropdownTreeviewComponent;
+  filterText: string;
+  private dropdownTreeviewSelectI18n: DropdownTreeviewSelectI18n;
+
+  constructor(public i18n: TreeviewI18n) {
+    this.config = TreeviewConfig.create({
+                                          hasAllCheckBox: false,
+                                          hasCollapseExpand: false,
+                                          hasFilter: true,
+                                          maxHeight: 500
+                                        });
+    this.dropdownTreeviewSelectI18n = i18n as DropdownTreeviewSelectI18n;
+  }
+
+  ngOnChanges(): void {
+    if (this.maxHeight) {
+      this.config.maxHeight = this.maxHeight;
+    }
+    this.updateSelectedItem();
+  }
+
+  select(item: TreeviewItem): void {
+    this.selectItem(item);
+  }
+
+  private updateSelectedItem(): void {
+    if (this.items !== null) {
+      const selectedItem = TreeviewHelper.findItemInList(this.items, this.value);
+      this.selectItem(selectedItem);
+    }
+  }
+
+  private selectItem(item: TreeviewItem): void {
+    if (this.dropdownTreeviewSelectI18n.selectedItem !== item) {
+      this.dropdownTreeviewSelectI18n.selectedItem = item;
+      if (this.dropdownTreeviewComponent) {
+        this.dropdownTreeviewComponent.onSelectedChange([item]);
+      }
+
+      if (item) {
+        if (this.value !== item.value) {
+          this.value = item.value;
+          this.valueChange.emit(item.value);
+        }
+      }
+    }
+  }
+}
--- a/frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts
+++ b/frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts
@ -0,0 +1,255 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  Input
+} from "@angular/core";
+import {
+  AdvancedProperty,
+  Event,
+  InputControl,
+  LocalStorageService,
+  NotNull,
+  PageContextHolder,
+  PageObjectUtils,
+  TaskParamsProvider,
+  Visible,
+  WebbpmStorage
+} from "@webbpm/base-package";
+import {TreeValuesCacheStrategy} from "../enum/TreeValuesCacheStrategy";
+import {TreeItem, TreeviewItem} from "ngx-treeview";
+import {
+  DropdownTreeviewSelectI18n
+} from "../external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n";
+import {
+  TreeItemDto
+} from "../../../generated/ru/micord/ervu/account_applications/component/model/TreeItemDto";
+import {
+  TreeItemRpcService
+} from "../../../generated/ru/micord/ervu/account_applications/component/rpc/TreeItemRpcService";
+
+
+@Component({
+             moduleId: module.id,
+             selector: 'dropdown-tree-view',
+             templateUrl: './../../../../../src/resources/template/account_applications/component/field/DropdownTreeView.html',
+             providers: [{
+               provide: DropdownTreeviewSelectI18n, useClass: DropdownTreeviewSelectI18n
+             }],
+             changeDetection: ChangeDetectionStrategy.OnPush
+           })
+export class DropdownTreeViewComponent extends InputControl {
+  @Input()
+  @AdvancedProperty()
+  public treeValuesCacheStrategy: TreeValuesCacheStrategy;
+  @Visible("treeValuesCacheStrategy == TreeValuesCacheStrategy.BY_CUSTOM_NAME")
+  @NotNull("treeValuesCacheStrategy == TreeValuesCacheStrategy.BY_CUSTOM_NAME")
+  @AdvancedProperty()
+  public treeValuesCustomName: string;
+  @Visible("false")
+  public cachedValue: any;
+  public collapseLevel: number;
+  public maxHeight: number;
+  @Visible("false")
+  public items: TreeviewItem[];
+  @Visible("false")
+  public value: any;
+  @Visible("false")
+  public valueChangeEvent: Event<TreeItemDto> = new Event<TreeItemDto>();
+  private rpcService: TreeItemRpcService;
+  private localStorageService: LocalStorageService;
+  private taskParamsProvider: TaskParamsProvider;
+  private pageContextHolder: PageContextHolder;
+  private webbpmStorage: WebbpmStorage;
+  private storageKey: string;
+
+  constructor(el: ElementRef, cd: ChangeDetectorRef,
+              private i18n: DropdownTreeviewSelectI18n) {
+    super(el, cd);
+  }
+
+  public initialize() {
+    super.initialize();
+    this.rpcService = this.getScript(TreeItemRpcService);
+    this.taskParamsProvider = this.injector.get(TaskParamsProvider);
+    this.localStorageService = this.injector.get(LocalStorageService);
+    this.pageContextHolder = this.injector.get(PageContextHolder);
+    this.webbpmStorage =
+        this.getTreeValuesStorage(this.treeValuesCacheStrategy, this.treeValuesCustomName);
+    this.cachedValue = this.getCachedValue();
+    this.loadTreeItems();
+  }
+
+  private getTreeValuesStorage(treeValuesCacheStrategy: TreeValuesCacheStrategy, customKeyName: string) {
+    if (!treeValuesCacheStrategy) {
+      return null;
+    }
+    switch (treeValuesCacheStrategy) {
+      case TreeValuesCacheStrategy.BY_PAGE_OBJECT_ID:
+        this.storageKey = PageObjectUtils.getPageObjectKey(this);
+        return this.readWebbpmStorage(this.storageKey);
+      case TreeValuesCacheStrategy.BY_OBJECT_NAME:
+        this.storageKey = this.getObjectName();
+        return this.readWebbpmStorage(this.storageKey);
+      case TreeValuesCacheStrategy.BY_CUSTOM_NAME:
+        this.storageKey = customKeyName;
+        return this.readWebbpmStorage(this.storageKey);
+      default:
+        throw new Error("Unknown tree values storage type = " + treeValuesCacheStrategy)
+    }
+  }
+
+  readWebbpmStorage(treeStorageKey: string) {
+    if (this.pageContextHolder.isPageInBpmnContext()) {
+      treeStorageKey = treeStorageKey + "$" + this.taskParamsProvider.processInstanceId
+    }
+    return this.localStorageService.readTemporalWebbpmStorage(treeStorageKey);
+  }
+
+  @Visible()
+  public loadTreeItems(): void {
+     this.rpcService.loadTreeData().then((res: TreeItemDto[]) => {
+      this.populateTree(res);
+    });
+  }
+
+  private populateTree(res: TreeItemDto[]){
+    this.items = res.map(value => new TreeviewItem(this.createTreeItem(value)));
+    const rootItem = this.items[0];
+    if (this.cachedValue) {
+      const matchedItem = this.findTreeItemByValue(this.items, this.cachedValue);
+      if (matchedItem) {
+        this.i18n.selectedItem = matchedItem;
+        this.value = matchedItem.value;
+      }
+    }
+    else {
+      this.i18n.selectedItem = rootItem;
+      this.value = rootItem.value;
+    }
+    this.doCollapseLevel();
+    this.valueChangeEvent.trigger(this.value);
+    this.cd.markForCheck();
+  }
+
+  private findTreeItemByValue(rootItems: TreeviewItem[], valueToFind: any): TreeviewItem | null {
+    for (const item of rootItems) {
+      if (JSON.stringify(item.value) === JSON.stringify(valueToFind)) {
+        return item;
+      }
+      if (item.children) {
+        const found = this.findTreeItemByValue(item.children, valueToFind);
+        if (found) {
+          return found;
+        }
+      }
+    }
+    return null;
+  }
+
+  private createTreeItem(treeItemDto: TreeItemDto): TreeItem {
+    let treeItem: TreeItem;
+    if (treeItemDto) {
+      treeItem = {
+        text: treeItemDto.label,
+        value: treeItemDto,
+        children: this.createTreeItemArray(treeItemDto.children)
+      };
+    }
+    return treeItem;
+  }
+
+  private createTreeItemArray(treeItemDtoArray: TreeItemDto[]): TreeItem[] {
+    if (treeItemDtoArray && treeItemDtoArray.length > 0) {
+      return treeItemDtoArray.map(value => this.createTreeItem(value));
+    }
+    return undefined;
+  }
+
+  public onValueChange($event: any) {
+    this.setCachedValue(this.value);
+    this.valueChangeEvent.trigger($event);
+    this.applyListener(this.changeListeners);
+  }
+
+  @Visible()
+  public getBusinessId(): any {
+    return this.value ? this.value.businessId : this.value;
+  }
+
+  @Visible()
+  public setCollapseLevel(level: number): void {
+    this.collapseLevel = level;
+  }
+
+  private doCollapseLevel(): void {
+    if (this.items != null && this.collapseLevel != null) {
+      this.items.forEach((value) => this.checkCollapseLevelRecursive(value, 0));
+    }
+  }
+
+  private checkCollapseLevelRecursive(viewItem: TreeviewItem, level: number): void {
+    if (level != null && this.collapseLevel != null && level >= this.collapseLevel) {
+      viewItem.setCollapsedRecursive(true);
+    }
+    else if (viewItem.children != null) {
+      viewItem.children.forEach((value) => this.checkCollapseLevelRecursive(value, level + 1))
+    }
+  }
+
+  protected setCachedValue(newValue: any): void {
+    if (this.webbpmStorage) {
+      this.webbpmStorage.put(this.storageKey, newValue);
+    }
+  }
+
+  protected getCachedValue(): any {
+    if (this.webbpmStorage) {
+      return this.webbpmStorage.get(this.storageKey);
+    }
+    return null;
+  }
+
+  isValueEmpty(): boolean {
+    return this.value == null;
+  }
+
+  hasValidModel(): boolean {
+    return !this.isRequired() || !this.isValueEmpty()
+  }
+
+  getPresentationValue(): string | number | boolean {
+    return this.value;
+  }
+
+  getValue(): any {
+    return this.value;
+  }
+
+  getValueAsModel(): any {
+    return this.value ? this.value : null;
+  }
+
+  getValueForForm(): any {
+    return this.getBusinessId();
+  }
+
+  setValue(value: any): any {
+    this.value = value;
+  }
+
+  onChange() {
+    super.onChange();
+    this.valueChangeEvent.trigger(this.value);
+  }
+
+  subscribeToModelChange() {
+    //empty because there is no ngModel here
+  }
+
+  unsubscribeToModelChange() {
+    //empty because there is no ngModel here
+  }
+
+}
--- a/frontend/src/ts/account_applications/component/filter/DropdownTreeViewFilterComponent.ts
+++ b/frontend/src/ts/account_applications/component/filter/DropdownTreeViewFilterComponent.ts
@ -0,0 +1,27 @@
+import {AnalyticalScope, Filter, FilterComponent, FilterUtil} from "@webbpm/base-package";
+import {DropdownTreeViewComponent} from "../field/DropdownTreeViewComponent";
+
+@AnalyticalScope(DropdownTreeViewComponent)
+export class DropdownTreeViewFilterComponent extends FilterComponent {
+
+  public isBusinessId: boolean;
+
+  public getFilter(): Filter {
+    let treeViewComponent = this.getScript(DropdownTreeViewComponent) as DropdownTreeViewComponent;
+    let model = treeViewComponent.value;
+
+    if (!model && treeViewComponent.cachedValue) {
+      let value = this.isBusinessId
+                  ? treeViewComponent.cachedValue.businessId
+                  : treeViewComponent.cachedValue.id;
+      return FilterUtil.singleValueFilter(this.getObjectId(), value, this.operation);
+    }
+    else if (model) {
+      let value = this.isBusinessId ? model.businessId : model.id;
+      return FilterUtil.singleValueFilter(this.getObjectId(), value, this.operation);
+    }
+    else {
+      return null;
+    }
+  }
+}
--- a/frontend/src/ts/modules/app/app.module.ts
+++ b/frontend/src/ts/modules/app/app.module.ts
@ -28,6 +28,9 @@ import {AppProgressIndicationComponent} from "./component/app-progress-indicatio
 import {AppProgressIndicationService} from "./service/app-progress-indication.service";
 import {VBoxLoadValues} from "../../account_applications/component/container/VBoxLoadValues";
 import {ErvuAccountTextFieldGridEditor} from "../../account_applications/component/editablegrid/editors/ErvuAccountTextFieldGridEditor";
+import {DropdownTreeViewComponent}from "../../account_applications/component/field/DropdownTreeViewComponent";
+import {DropdownTreeviewSelectComponent} from "../../account_applications/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component";
+import {TreeviewModule} from "ngx-treeview";

 registerLocaleData(localeRu);
 export const DIRECTIVES = [
@ -44,6 +47,8 @@ export const DIRECTIVES = [
  forwardRef(() => NewPasswordComponent),
  forwardRef(() => AppProgressIndicationComponent),
  forwardRef(() => VBoxLoadValues),
+  forwardRef(() => DropdownTreeViewComponent),
+  forwardRef(() => DropdownTreeviewSelectComponent),
  forwardRef(() => ErvuAccountTextFieldGridEditor)
 ];

@ -58,7 +63,8 @@ export const DIRECTIVES = [
              ComponentsModule,
              AgGridModule,
              RouterModule,
-              InternationalPhoneNumberModule
+              InternationalPhoneNumberModule,
+              TreeviewModule.forRoot()
            ],
            declarations: [
              DIRECTIVES
--- a/frontend/systemjs.config.js
+++ b/frontend/systemjs.config.js
@ -60,7 +60,8 @@
      'chartjs-adapter-moment':            'npm:chartjs-adapter-moment/dist/chartjs-adapter-moment.js',
      'tslib':                             'npm:tslib/tslib.js',
      'ngx-international-phone-number':    'npm:ngx-international-phone-number/ngx-international-phone-number.umd.js',
-      'google-libphonenumber':             'npm:google-libphonenumber/dist/libphonenumber.js'
+      'google-libphonenumber':             'npm:google-libphonenumber/dist/libphonenumber.js',
+      'ngx-treeview':                      'npm:ngx-treeview',
    },
    packages: {
      'webbpm':                     { main: 'main',  defaultExtension: 'js'},
@ -85,7 +86,8 @@
      'inputmask': {
        main: 'dist/inputmask.js',
        defaultExtension: 'js'
-      }
+      },
+      'ngx-treeview':               { main: "bundles/ngx-treeview.umd.js", defaultExtension: 'js'}
    }
  });
 })(this);
--- a/frontend/systemjs.preview.config.js
+++ b/frontend/systemjs.preview.config.js
@ -60,7 +60,8 @@
      'chartjs-adapter-moment':            'npm:chartjs-adapter-moment/dist/chartjs-adapter-moment.js',
      'tslib':                             'npm:tslib/tslib.js',
      'ngx-international-phone-number':    'npm:ngx-international-phone-number/ngx-international-phone-number.umd.js',
-      'google-libphonenumber':             'npm:google-libphonenumber/dist/libphonenumber.js'
+      'google-libphonenumber':             'npm:google-libphonenumber/dist/libphonenumber.js',
+      'ng2-dropdown-treeview':             'npm:ng2-dropdown-treeview',
    },
    packages: {
      'preview':                    { main: './modules/preview/preview.main',  defaultExtension: 'js'},
@ -84,7 +85,8 @@
      'inputmask': {
        main: 'dist/inputmask.js',
        defaultExtension: 'js'
-      }
+      },
+      'ng2-dropdown-treeview':{ main: "bundles/ng2-dropdown-treeview.umd.js", defaultExtension: 'js'}
    }
  });
 })(this);
--- a/resources/src/main/resources/DropdownTreeView.component
+++ b/resources/src/main/resources/DropdownTreeView.component
@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xmlComponent>
+    <id>803bd971-3b5e-4344-b687-7e103b3d3326</id>
+    <name>DropdownTreeView</name>
+    <internal>false</internal>
+    <versions>
+        <studioVersion>3.185.1</studioVersion>
+        <packageVersions>
+            <entry>
+                <key>ru.cg.webbpm.packages.base.resources</key>
+                <value>3.185.2</value>
+            </entry>
+        </packageVersions>
+    </versions>
+    <rootObject id="8174c549-4b94-4c3e-9168-09610ade4c6e">
+        <name>DropdownTreeView</name>
+        <container>false</container>
+        <expanded>false</expanded>
+        <childrenReordered>false</childrenReordered>
+        <scripts id="d524f4d7-efdc-45ac-a9a5-a160e241b871">
+            <classRef type="TS">
+                <className>DropdownTreeViewComponent</className>
+                <packageName>account_applications.component.field</packageName>
+            </classRef>
+            <enabled>true</enabled>
+            <expanded>true</expanded>
+            <properties>
+                <entry>
+                    <key>collapseLevel</key>
+                    <value>
+                        <simple>2.0</simple>
+                    </value>
+                </entry>
+                <entry>
+                    <key>visible</key>
+                    <value>
+                        <simple>true</simple>
+                    </value>
+                </entry>
+            </properties>
+        </scripts>
+        <scripts id="e911e686-ce91-4aec-8554-0b6e44e7325d">
+            <classRef type="TS">
+                <className>DropdownTreeViewFilterComponent</className>
+                <packageName>account_applications.component.filter</packageName>
+            </classRef>
+            <expanded>true</expanded>
+            <properties>
+                <entry>
+                    <key>operation</key>
+                    <value>
+                        <simple>null</simple>
+                    </value>
+                </entry>
+            </properties>
+        </scripts>
+        <scripts id="77cc6e8e-3df7-4916-af81-1526a952d951">
+            <classRef type="JAVA">
+                <className>TreeItemRpcService</className>
+                <packageName>ru.micord.ervu.account_applications.component.rpc</packageName>
+            </classRef>
+            <enabled>true</enabled>
+            <expanded>true</expanded>
+            <properties>
+                <entry>
+                    <key>treeItemService</key>
+                    <value>
+                        <complex>
+                            <entry>
+<key>businessIdColumn</key>
+<value>
+    <simple>null</simple>
+</value>
+                            </entry>
+                            <entry>
+<key>idColumn</key>
+<value>
+    <simple>null</simple>
+</value>
+                            </entry>
+                            <entry>
+<key>labelColumn</key>
+<value>
+    <simple>null</simple>
+</value>
+                            </entry>
+                            <entry>
+<key>loadDao</key>
+<value>
+    <complex>
+        <entry>
+            <key>graph</key>
+            <value>
+                <simple>null</simple>
+            </value>
+        </entry>
+    </complex>
+</value>
+                            </entry>
+                            <entry>
+<key>parentIdColumn</key>
+<value>
+    <simple>null</simple>
+</value>
+                            </entry>
+                        </complex>
+                    </value>
+                </entry>
+            </properties>
+        </scripts>
+        <scripts id="ffbb4d4e-8233-4825-9f19-30b13e6f4b1a">
+            <classRef type="JAVA">
+                <className>FilterControl</className>
+                <packageName>component.field.persist.filter</packageName>
+            </classRef>
+            <expanded>true</expanded>
+        </scripts>
+        <scripts id="84277acf-3b7f-4283-8d9f-0ab72ad2fe2f">
+            <classRef type="JAVA">
+                <className>DropDownTree</className>
+                <packageName>ru.micord.ervu.account_applications.component.field.persist</packageName>
+            </classRef>
+            <expanded>true</expanded>
+        </scripts>
+    </rootObject>
+</xmlComponent>
--- a/resources/src/main/resources/business-model/Список
+++ b/resources/src/main/resources/business-model/Список
@ -1111,24 +1111,14 @@
                            <enabled>false</enabled>
                        </scripts>
                    </children>
-                    <children id="d5c7ef33-6035-4963-aaa9-79868c2c3198">
-                        <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
-                        <componentRootId>d5c7ef33-6035-4963-aaa9-79868c2c3198</componentRootId>
-                        <name>Организация (filter)</name>
+                    <children id="e2961329-e07b-40bc-bc6b-c30e980394bf">
+                        <prototypeId>8174c549-4b94-4c3e-9168-09610ade4c6e</prototypeId>
+                        <componentRootId>e2961329-e07b-40bc-bc6b-c30e980394bf</componentRootId>
+                        <name>DropdownTreeView</name>
                        <container>false</container>
                        <childrenReordered>false</childrenReordered>
-                        <scripts id="848c80a8-d213-48d0-be5c-c7da93c48620">
+                        <scripts id="d524f4d7-efdc-45ac-a9a5-a160e241b871">
                            <properties>
-<entry>
-    <key>cssClasses</key>
-    <value>
-        <item id="377d06c2-1ba2-4b64-94d8-7b75b3c1939b" removed="false">
-            <value>
-                <simple>"width-full"</simple>
-            </value>
-        </item>
-    </value>
-</entry>
 <entry>
    <key>label</key>
    <value>
@ -1137,8 +1127,15 @@
 </entry>
                            </properties>
                        </scripts>
-                        <scripts id="59ec7992-f088-4dbf-8bfe-3b38d9a89408">
+                        <scripts id="e911e686-ce91-4aec-8554-0b6e44e7325d">
+                            <enabled>true</enabled>
                            <properties>
+<entry>
+    <key>isBusinessId</key>
+    <value>
+        <simple>true</simple>
+    </value>
+</entry>
 <entry>
    <key>operation</key>
    <value>
@ -1147,43 +1144,32 @@
 </entry>
                            </properties>
                        </scripts>
-                        <scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
+                        <scripts id="77cc6e8e-3df7-4916-af81-1526a952d951">
                            <properties>
 <entry>
-    <key>comboBoxService</key>
+    <key>treeItemService</key>
    <value>
        <complex>
            <entry>
                <key>businessIdColumn</key>
+                <value>
+                    <simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"id"}</simple>
+                </value>
+            </entry>
+            <entry>
+                <key>domainIdColumn</key>
                <value>
                    <simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
                </value>
            </entry>
            <entry>
-                <key>columnSorts</key>
+                <key>idColumn</key>
                <value>
-                    <item id="87a469a1-4c30-40d3-9af1-4920be9e9da7" removed="false">
-                        <value>
-                            <complex>
-<entry>
-    <key>field</key>
-    <value>
-        <simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"fullname"}</simple>
-    </value>
-</entry>
-<entry>
-    <key>sortOrder</key>
-    <value>
-        <simple>"ASC"</simple>
-    </value>
-</entry>
-                            </complex>
-                        </value>
-                    </item>
+                    <simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"idm_id"}</simple>
                </value>
            </entry>
            <entry>
-                <key>displayColumn</key>
+                <key>labelColumn</key>
                <value>
                    <simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"fullname"}</simple>
                </value>
@ -1195,43 +1181,48 @@
                        <entry>
                            <key>graph</key>
                            <value>
-<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":215.0,"y":265.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":215.0,"y":265.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":215.0,"y":265.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment":{"tableName":"recruitment","schemaName":"public","x":367.0,"y":247.0,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
+                            </value>
+                        </entry>
+                        <entry>
+                            <key>uniqueResult</key>
+                            <value>
+<simple>true</simple>
                            </value>
                        </entry>
                    </complex>
                </value>
            </entry>
+            <entry>
+                <key>parentIdColumn</key>
+                <value>
+                    <simple>{"schema":"public","table":"recruitment","entity":"recruitment","name":"parent_id"}</simple>
+                </value>
+            </entry>
        </complex>
-        <implRef type="JAVA">
-            <className>RecruitmentComboBoxService</className>
-            <packageName>ru.micord.ervu.account_applications.component.service</packageName>
-        </implRef>
    </value>
 </entry>
                            </properties>
                        </scripts>
-                        <scripts id="b17eca3b-9ec5-4462-9d6f-30bd53f91d12">
+                        <scripts id="ffbb4d4e-8233-4825-9f19-30b13e6f4b1a">
+                            <enabled>true</enabled>
                            <properties>
 <entry>
    <key>columnForFilter</key>
    <value>
        <simple>{"schema":"public","table":"user_application_list","entity":"user_application_list","name":"recruitment_id"}</simple>
    </value>
-</entry>
-<entry>
-    <key>dataConverter</key>
-    <value>
-        <implRef type="JAVA">
-            <className>StringValueConverter</className>
-            <packageName>component.field.dataconvert</packageName>
-        </implRef>
-    </value>
 </entry>
                            </properties>
                        </scripts>
-                        <scripts id="4d028ea6-e4a3-4acf-bd60-de7aa1a78f71"/>
-                        <scripts id="9f543b36-92e3-4a63-b8db-a4d7e852113e"/>
-                        <scripts id="47f307b6-79a7-4c9a-96d6-6ee423565f02"/>
+                        <scripts id="84277acf-3b7f-4283-8d9f-0ab72ad2fe2f"/>
+                    </children>
+                    <children id="d5c7ef33-6035-4963-aaa9-79868c2c3198">
+                        <prototypeId>3a00a919-c6aa-4fbf-951e-b6f2dbc24764</prototypeId>
+                        <componentRootId>d5c7ef33-6035-4963-aaa9-79868c2c3198</componentRootId>
+                        <name>Организация (filter)</name>
+                        <container>false</container>
+                        <removed>true</removed>
                    </children>
                    <children id="55ffb039-3d8b-4e49-a0fa-e15b703f578e">
                        <prototypeId>9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91</prototypeId>
@ -1496,244 +1487,7 @@
                            <componentRootId>923a6d44-3bed-4fdf-b924-6388cafcbb4c</componentRootId>
                            <name>Action Controller2</name>
                            <container>false</container>
-                            <childrenReordered>false</childrenReordered>
-                            <scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
-<properties>
-    <entry>
-        <key>eventRefs</key>
-        <value>
-            <item id="2e637366-d2f8-47fd-b7dd-f7b99efd9cc0" removed="false">
-                <value>
-                    <complex>
-                        <entry>
-                            <key>behavior</key>
-                            <value>
-<simple>{"objectId":"287bf776-f112-44c0-ae48-24a5f2ffc7d0","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
-                            </value>
-                        </entry>
-                        <entry>
-                            <key>propertyName</key>
-                            <value>
-<simple>"clickEvent"</simple>
-                            </value>
-                        </entry>
-                    </complex>
-                </value>
-            </item>
-        </value>
-    </entry>
-    <entry>
-        <key>ifCondition</key>
-        <value>
-            <complex>
-                <entry>
-                    <key>conditions</key>
-                    <value>
-                        <item id="ac2af951-9e51-444b-824f-dc83dfb12f93" removed="false">
-                            <value>
-<complex>
-    <entry>
-        <key>_isGroupSelected</key>
-        <value>
-            <simple>false</simple>
-        </value>
-    </entry>
-    <entry>
-        <key>one</key>
-        <value>
-            <complex>
-                <entry>
-                    <key>conditionFirstPart</key>
-                    <value>
-                        <complex>
-                            <entry>
-<key>objectValue</key>
-<value>
-    <complex>
-        <entry>
-            <key>behavior</key>
-            <value>
-                <simple>{"objectId":"287bf776-f112-44c0-ae48-24a5f2ffc7d0","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>method</key>
-            <value>
-                <simple>"getResult"</simple>
-            </value>
-        </entry>
-    </complex>
-</value>
-                            </entry>
-                        </complex>
-                    </value>
-                </entry>
-                <entry>
-                    <key>operation</key>
-                    <value>
-                        <simple>"IS_NOT_EMPTY"</simple>
-                    </value>
-                </entry>
-            </complex>
-        </value>
-    </entry>
-</complex>
-                            </value>
-                        </item>
-                        <item id="564c5199-a9fc-4b03-ac82-9a87f5a58142" removed="false">
-                            <value>
-<complex>
-    <entry>
-        <key>_isGroupSelected</key>
-        <value>
-            <simple>false</simple>
-        </value>
-    </entry>
-    <entry>
-        <key>one</key>
-        <value>
-            <complex>
-                <entry>
-                    <key>conditionFirstPart</key>
-                    <value>
-                        <complex>
-                            <entry>
-<key>objectValue</key>
-<value>
-    <complex>
-        <entry>
-            <key>argument</key>
-            <value>
-                <complex>
-                    <entry>
-                        <key>staticValue</key>
-                        <value>
-                            <implRef type="TS">
-<className>string</className>
-<packageName></packageName>
-                            </implRef>
-                            <simple>"Администратор ПОИБ"</simple>
-                        </value>
-                    </entry>
-                </complex>
-            </value>
-        </entry>
-        <entry>
-            <key>behavior</key>
-            <value>
-                <simple>{"objectId":"891cc099-3ea0-45f4-b2a9-85550ae1136d","packageName":"modules.user-management.component","className":"CheckUserRole","type":"TS"}</simple>
-            </value>
-        </entry>
-        <entry>
-            <key>method</key>
-            <value>
-                <simple>"hasRole"</simple>
-            </value>
-        </entry>
-    </complex>
-</value>
-                            </entry>
-                        </complex>
-                    </value>
-                </entry>
-                <entry>
-                    <key>conditionSecondPart</key>
-                    <value>
-                        <complex>
-                            <entry>
-<key>staticValue</key>
-<value>
-    <implRef type="TS">
-        <className>boolean</className>
-        <packageName></packageName>
-    </implRef>
-    <simple>false</simple>
-</value>
-                            </entry>
-                        </complex>
-                    </value>
-                </entry>
-                <entry>
-                    <key>operation</key>
-                    <value>
-                        <simple>"EQUALS"</simple>
-                    </value>
-                </entry>
-            </complex>
-        </value>
-    </entry>
-</complex>
-                            </value>
-                        </item>
-                    </value>
-                </entry>
-                <entry>
-                    <key>logicalOperation</key>
-                    <value>
-                        <simple>null</simple>
-                    </value>
-                </entry>
-            </complex>
-        </value>
-    </entry>
-    <entry>
-        <key>thenActions</key>
-        <value>
-            <item id="0aea3f15-a642-4ede-a438-acb904c6194b" removed="false">
-                <value>
-                    <complex>
-                        <entry>
-                            <key>behavior</key>
-                            <value>
-<simple>{"objectId":"d5c7ef33-6035-4963-aaa9-79868c2c3198","packageName":"component.filter","className":"FilterComboBox","type":"TS"}</simple>
-                            </value>
-                        </entry>
-                        <entry>
-                            <key>method</key>
-                            <value>
-<simple>"setValueByBusinessId"</simple>
-                            </value>
-                        </entry>
-                        <entry>
-                            <key>value</key>
-                            <value>
-<complex>
-    <entry>
-        <key>objectValue</key>
-        <value>
-            <complex>
-                <entry>
-                    <key>argument</key>
-                    <value>
-                        <simple>null</simple>
-                    </value>
-                </entry>
-                <entry>
-                    <key>behavior</key>
-                    <value>
-                        <simple>{"objectId":"287bf776-f112-44c0-ae48-24a5f2ffc7d0","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
-                    </value>
-                </entry>
-                <entry>
-                    <key>method</key>
-                    <value>
-                        <simple>"getResult"</simple>
-                    </value>
-                </entry>
-            </complex>
-        </value>
-    </entry>
-</complex>
-                            </value>
-                        </entry>
-                    </complex>
-                </value>
-            </item>
-            <item id="063371a2-13b4-48bc-b2fa-26bfda38bbbb" removed="true"/>
-        </value>
-    </entry>
-</properties>
-                            </scripts>
+                            <removed>true</removed>
                        </children>
                    </children>
                    <children id="29b62d70-b482-4e5b-acfa-79570a07ba64">
@ -5132,6 +4886,7 @@
            <componentRootId>8f7a7363-7ed3-496d-a4c1-c8879cbe7e50</componentRootId>
            <name>FormReportingButton</name>
            <container>false</container>
+            <expanded>false</expanded>
            <childrenReordered>false</childrenReordered>
            <scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
                <properties>
@ -5974,7 +5729,7 @@
                            <entry>
 <key>filterControlRef</key>
 <value>
-    <simple>{"objectId":"d5c7ef33-6035-4963-aaa9-79868c2c3198","packageName":"component.field.persist.filter","className":"FilterControl","type":"JAVA"}</simple>
+    <simple>{"objectId":"e2961329-e07b-40bc-bc6b-c30e980394bf","packageName":"component.field.persist.filter","className":"FilterControl","type":"JAVA"}</simple>
 </value>
                            </entry>
                            <entry>