diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt index 1e7da14..816c422 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt @@ -53,9 +53,13 @@ class RankingRepository( sortType: String, theme: String = "" ): List { - val blockMemberCondition = blockMember.member.id.eq(member.id) - .and(blockMember.isActive.isTrue) - .and(blockMember.blockedMember.id.eq(memberId)) + val blockMemberCondition = if (memberId != null) { + blockMember.member.id.eq(member.id) + .and(blockMember.isActive.isTrue) + .and(blockMember.blockedMember.id.eq(memberId)) + } else { + null + } var where = audioContent.isActive.isTrue .and(audioContent.member.isActive.isTrue) @@ -205,9 +209,13 @@ class RankingRepository( startDate: LocalDateTime, endDate: LocalDateTime ): List { - val blockMemberCondition = blockMember.member.id.eq(member.id) - .and(blockMember.isActive.isTrue) - .and(blockMember.blockedMember.id.eq(memberId)) + val blockMemberCondition = if (memberId != null) { + blockMember.member.id.eq(member.id) + .and(blockMember.isActive.isTrue) + .and(blockMember.blockedMember.id.eq(memberId)) + } else { + null + } var where = series.isActive.isTrue .and(audioContent.isActive.isTrue) @@ -437,9 +445,13 @@ class RankingRepository( startDate: LocalDateTime, endDate: LocalDateTime ): List { - val blockMemberCondition = blockMember.member.id.eq(member.id) - .and(blockMember.isActive.isTrue) - .and(blockMember.blockedMember.id.eq(memberId)) + val blockMemberCondition = if (memberId != null) { + blockMember.member.id.eq(member.id) + .and(blockMember.isActive.isTrue) + .and(blockMember.blockedMember.id.eq(memberId)) + } else { + null + } val ordersCondition = order.audioContent.id.eq(audioContent.id) .and(order.isActive.isTrue)