diff --git a/src/main/java/app/repositories/BanRepository.java b/src/main/java/app/repositories/BanRepository.java index 57109f9..a117c02 100644 --- a/src/main/java/app/repositories/BanRepository.java +++ b/src/main/java/app/repositories/BanRepository.java @@ -16,7 +16,7 @@ public interface BanRepository extends PagingAndSortingRepository { "(:ban_ids_non_exists = true or b.id in :ban_ids) and " + "(:account_ids_non_exists = true or b.account_id in :account_ids) and " + "(:begin_date is null or DATE_PART('EPOCH', b.timestamp) >= :begin_date) and " + - "(:end_date is null or :end_date <= DATE_PART('EPOCH', b.timestamp)) and " + + "(:end_date is null or :end_date >= DATE_PART('EPOCH', b.timestamp)) and " + "(:active is null or b.active = :active) and " + "(:admin_ids_non_exists = true or b.unbanned_by_id in :admin_ids) order by b.id desc") Page getBans(Pageable pageable, diff --git a/src/main/java/app/repositories/MessageRepository.java b/src/main/java/app/repositories/MessageRepository.java index d60a022..3594d6b 100644 --- a/src/main/java/app/repositories/MessageRepository.java +++ b/src/main/java/app/repositories/MessageRepository.java @@ -12,7 +12,7 @@ public interface MessageRepository extends PagingAndSortingRepository= :begin_date) and " + - "(:end_date is null or :end_date <= m.utime) and " + + "(:end_date is null or :end_date >= m.utime) and " + "(:message_contain is null or m.message like :message_contain) and " + "(:server_id is null or m.server_id like :server_id) order by m.id desc ") Page getMessages(Pageable pageable,