src/main/kotlin/kr/co/vividnext/sodalive/rank/RankingRepository.kt

@@ -68,7 +68,6 @@ class RankingRepository(
             .and(audioContent.duration.isNotNull)
             .and(audioContentTheme.isActive.isTrue)
             .and(audioContent.limited.isNull)
-            .and(blockMember.id.isNull)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
@@ -142,6 +141,7 @@ class RankingRepository(
         }
 
         if (memberId != null) {
+            where = where.and(blockMember.id.isNull)
             select = select.leftJoin(blockMember).on(blockMemberCondition)
         }
 
@@ -224,7 +224,6 @@ class RankingRepository(
             .and(member.role.eq(MemberRole.CREATOR))
             .and(audioContent.duration.isNotNull)
             .and(audioContent.limited.isNull)
-            .and(blockMember.id.isNull)
             .and(order.isActive.isTrue)
             .and(order.createdAt.goe(startDate))
             .and(order.createdAt.lt(endDate))
@@ -256,6 +255,7 @@ class RankingRepository(
             .leftJoin(order).on(audioContent.id.eq(order.audioContent.id))
 
         if (memberId != null) {
+            where = where.and(blockMember.id.isNull)
             select = select.leftJoin(blockMember).on(blockMemberCondition)
         }
 
@@ -466,7 +466,6 @@ class RankingRepository(
             .and(audioContent.price.gt(0))
             .and(audioContent.duration.isNotNull)
             .and(audioContent.limited.isNull)
-            .and(blockMember.id.isNull)
 
         if (!isAdult) {
             where = where.and(audioContent.isAdult.isFalse)
@@ -499,6 +498,7 @@ class RankingRepository(
             .leftJoin(order).on(ordersCondition)
 
         if (memberId != null) {
+            where = where.and(blockMember.id.isNull)
             select = select.leftJoin(blockMember).on(blockMemberCondition)
         }