diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java index d7f5d4d6bf228e38b10bfdb5759cfd215ac7f831..79817d233d46f90fde7df3a03c78b8db7c3a444e 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/Business.java @@ -536,7 +536,7 @@ public class Business { public Predicate personPredicateWithTopUnit(EffectivePerson effectivePerson) throws Exception { EntityManager em = emc.get(Person.class); CriteriaBuilder cb = em.getCriteriaBuilder(); - if (effectivePerson.isManager() || this.hasAnyRole(effectivePerson, OrganizationDefinition.Manager, + if (effectivePerson.isSecurityManager() || this.hasAnyRole(effectivePerson, OrganizationDefinition.Manager, OrganizationDefinition.OrganizationManager)) { return cb.conjunction(); } else { diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java index 7cfbce49672bd80ae825276f74d57bd87f29082f..20c8460697714eef748b6723a09ba36b063927c3 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListNext.java @@ -45,7 +45,7 @@ class ActionListNext extends BaseAction { id = o.getId(); } - if (effectivePerson.isManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager, + if (effectivePerson.isSecurityManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager, OrganizationDefinition.OrganizationManager)) { result = this.standardListNext(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, DESC, business.personPredicateWithTopUnit(effectivePerson)); diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java index 73fdec8b0fd1b9e0f0cf18b4b00d011fcc99bdc2..1dd4978529de1d17d64424615d165e5a4660e5f6 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionListPrev.java @@ -44,7 +44,7 @@ class ActionListPrev extends BaseAction { } id = o.getId(); } - if (effectivePerson.isManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager, + if (effectivePerson.isSecurityManager() || business.hasAnyRole(effectivePerson, OrganizationDefinition.Manager, OrganizationDefinition.OrganizationManager)) { result = this.standardListPrev(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, DESC, business.personPredicateWithTopUnit(effectivePerson));