diff --git a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/identity/ActionListWithPersonWithUnitObject.java b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/identity/ActionListWithPersonWithUnitObject.java index 7a06397b9d4dcb0ca58f92c0a4fdf4b7e114ec16..7c9792e0c24e3cdbf881aec2b3ad927fa1ee61af 100644 --- a/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/identity/ActionListWithPersonWithUnitObject.java +++ b/o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/identity/ActionListWithPersonWithUnitObject.java @@ -64,12 +64,11 @@ class ActionListWithPersonWithUnitObject extends BaseAction { Root root = cq.from(Identity.class); Predicate p = cb.disjunction(); for (Pair o : cartesian) { - p = cb.or(cb.and(cb.equal(root.get(Identity_.unit), o.getUnit()), + p = cb.or(p, cb.and(cb.equal(root.get(Identity_.unit), o.getUnit()), cb.equal(root.get(Identity_.person), o.getPerson()))); } - List identityIds = em.createQuery(cq.select(root.get(Identity_.id)).where(p)) - .getResultList().stream().distinct().collect(Collectors.toList()); - identityIds = ListTools.trim(identityIds, true, true); + List identityIds = em.createQuery(cq.select(root.get(Identity_.id)).where(p)).getResultList().stream() + .distinct().collect(Collectors.toList()); List list = business.identity().pick(identityIds); for (Identity o : list) { wos.add(this.convert(business, o, Wo.class));