Skip to content

Commit ef60d8e

Browse files
committed
fixed note specification for when active or pinned filter used
1 parent 39be582 commit ef60d8e

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/main/java/edu/tamu/app/model/repo/specification/NoteSpecification.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@ public Predicate toPredicate(Root<E> root, CriteriaQuery<?> query, CriteriaBuild
5151

5252
}
5353

54-
return cb.and(cb.or(activeOrPinnedPredicates.toArray(new Predicate[activeOrPinnedPredicates.size()])), cb.and(servicePredicates.toArray(new Predicate[servicePredicates.size()])));
54+
Predicate predicate;
55+
56+
if (activeOrPinnedPredicates.size() > 0) {
57+
predicate = cb.and(cb.or(activeOrPinnedPredicates.toArray(new Predicate[activeOrPinnedPredicates.size()])), cb.and(servicePredicates.toArray(new Predicate[servicePredicates.size()])));
58+
} else {
59+
predicate = cb.and(servicePredicates.toArray(new Predicate[servicePredicates.size()]));
60+
}
61+
62+
return predicate;
5563
}
5664

5765
}

0 commit comments

Comments
 (0)