diff --git a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java index 25299ac103f2ac8c11421b867608f47e88254697..81e16ef679990cc2d2e0628d53921d9b84088f68 100644 --- a/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java +++ b/o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/person/ActionDelete.java @@ -149,7 +149,7 @@ class ActionDelete extends BaseAction { CriteriaQuery cq = cb.createQuery(Unit.class); Root root = cq.from(Unit.class); Predicate p = cb.isMember(person.getId(), root.get(Unit_.controllerList)); - p = cb.or(cb.isMember(person.getId(), root.get(Unit_.inheritedControllerList))); + //p = cb.or(cb.isMember(person.getId(), root.get(Unit_.inheritedControllerList))); List os = em.createQuery(cq.select(root).where(p)).getResultList().stream().distinct().collect(Collectors.toList()); for (Unit o : os) { o.getControllerList().remove(person.getId());