|
|
@@ -43,6 +43,7 @@ class ActionListWithCurrentPersonWithoutIMDesc extends BaseAction {
|
|
|
Root<Instant> root = cq.from(Instant.class);
|
|
|
Predicate p = cb.equal(root.get(Instant_.person), effectivePerson.getDistinguishedName());
|
|
|
p = cb.and(p, cb.notEqual(root.get(Instant_.type), MessageConnector.TYPE_IM_CREATE));
|
|
|
+ p = cb.and(p, cb.isNotEmpty(root.get(Instant_.consumerList)));
|
|
|
List<Instant> os = em.createQuery(cq.select(root).where(p).orderBy(cb.desc(root.get(Instant_.createTime))))
|
|
|
.setMaxResults(count).getResultList();
|
|
|
return Wo.copier.copy(os);
|