micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8912:fixes

Browse source
This commit is contained in:
adel.kalimullin 2025-02-18 14:44:52 +03:00
parent 9b7e7fe543
commit 8cdbd44f64
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java
View file

@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import component.field.persist.filter.FilterControl;
import model.Filter;
import model.grid.GridRows;
import model.grid.SortInfo;
@ -20,7 +21,6 @@ import ru.cg.webbpm.modules.database.bean.filter.FilterOperation;
import ru.cg.webbpm.modules.security.api.runtime.SecurityContext;
import ru.cg.webbpm.modules.standard_annotations.editor.ObjectRef;
import ru.cg.webbpm.modules.standard_annotations.validation.NotNull;
import ru.cg.webbpm.modules.webkit.beans.Behavior;
/**
* @author Adel Kalimullin
@ -31,7 +31,7 @@ public class RecruitmentGridService extends GridV2ServiceImpl {
private final SecurityContext securityContext;
@ObjectRef
@NotNull
public Behavior recruitmentBehavior;
public FilterControl filterControlRef;
@LocalGraphSource(sourceFieldName = "loadDao")
public EntityColumn recruitmentColumn;
@ -59,13 +59,13 @@ public class RecruitmentGridService extends GridV2ServiceImpl {
private Optional<Filter> findRecruitmentFilter(List<Filter> filters) {
return filters.stream()
.filter(filter -> recruitmentBehavior.getObjectId().equals(filter.componentGuid))
.filter(filter -> filterControlRef.getObjectId().equals(filter.componentGuid))
.findFirst();
}
private List<String> getChildRecruitmentIds(List<Filter> filters, Filter recruitmentFilter) {
String selectedRecruitmentId = (String) recruitmentFilter.filterModels[0].getValue();
filters.removeIf(filter -> recruitmentBehavior.getObjectId().equals(filter.componentGuid));
filters.removeIf(filter -> filterControlRef.getObjectId().equals(filter.componentGuid));
return recruitmentDao.getRecruitmentIdsWithParentByRecruitmentId(selectedRecruitmentId);
}