diff --git a/src/main/java/app/entities/SearchFilter.java b/src/main/java/app/entities/SearchFilter.java index 78f6654..238b85a 100644 --- a/src/main/java/app/entities/SearchFilter.java +++ b/src/main/java/app/entities/SearchFilter.java @@ -21,11 +21,12 @@ public abstract class SearchFilter { public List getAccounts(ProfileService profileService) { if (accounts == null || accounts.isEmpty()) return null; - return accounts.stream() + List filtered = accounts.stream() .map(profileService::GetSteamIDFromAnyData) .filter(Objects::nonNull) .map(sId -> sId.account_id) .toList(); + return filtered.isEmpty()?null:filtered; } public Long getBeginUnixTime() { diff --git a/src/main/java/app/repositories/BanRepository.java b/src/main/java/app/repositories/BanRepository.java index 1aac7f1..75e5716 100644 --- a/src/main/java/app/repositories/BanRepository.java +++ b/src/main/java/app/repositories/BanRepository.java @@ -20,10 +20,10 @@ public interface BanRepository extends PagingAndSortingRepository { "(:active is null or b.active = :active) and " + "(:admin_ids is null or b.unbanned_by_id in :admin_ids) order by b.id desc") Page getBans(Pageable pageable, - @Param(value = "ban_ids")List ban_ids, - @Param(value = "account_ids") List account_ids, + @Param(value = "ban_ids") Iterable ban_ids, + @Param(value = "account_ids") Iterable account_ids, @Param(value = "begin_date") Long begin_date, @Param(value = "end_date") Long end_date, @Param(value = "active") Boolean active, - @Param(value = "admin_ids") List admin_ids); + @Param(value = "admin_ids") Iterable admin_ids); } diff --git a/src/main/java/app/repositories/KillfeedRepository.java b/src/main/java/app/repositories/KillfeedRepository.java index f93af04..2481d27 100644 --- a/src/main/java/app/repositories/KillfeedRepository.java +++ b/src/main/java/app/repositories/KillfeedRepository.java @@ -26,7 +26,7 @@ public interface KillfeedRepository extends PagingAndSortingRepository getKills(Pageable pageable, - @Param("accounts_id") List accounts_id, + @Param("accounts_id") Iterable accounts_id, @Param("server_id") String server_id, @Param("utime") Long utime); @@ -45,7 +45,7 @@ public interface KillfeedRepository extends PagingAndSortingRepository getDeads(Pageable pageable, - @Param("accounts_id") List accounts_id, + @Param("accounts_id") Iterable accounts_id, @Param("server_id") String server_id, @Param("utime") Long utime); @@ -75,7 +75,7 @@ public interface KillfeedRepository extends PagingAndSortingRepository getAssists(Pageable pageable, - @Param("accounts_id") List accounts_id, + @Param("accounts_id") Iterable accounts_id, @Param("server_id") String server_id, @Param("utime") Long utime); } diff --git a/src/main/java/app/repositories/MessageRepository.java b/src/main/java/app/repositories/MessageRepository.java index d49a6a6..9f6d376 100644 --- a/src/main/java/app/repositories/MessageRepository.java +++ b/src/main/java/app/repositories/MessageRepository.java @@ -7,8 +7,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -import java.util.List; - public interface MessageRepository extends PagingAndSortingRepository { @Query(value = "select m from Message m where " + @@ -18,7 +16,7 @@ public interface MessageRepository extends PagingAndSortingRepository getMessages(Pageable pageable, - @Param(value = "account_ids") List account_ids, + @Param(value = "account_ids") Iterable account_ids, @Param(value = "begin_date") Long begin_date, @Param(value = "end_date") Long end_date, @Param(value = "message_contain") String message_contain,