diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt index 947d3fe..f94b641 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt @@ -40,7 +40,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) { .and(liveRoom.beginDateTime.loe(endDate)) ) .groupBy(liveRoom.id, useCan.canUsage) - .orderBy(member.nickname.desc(), formattedDate.desc()) + .orderBy(member.nickname.desc(), liveRoom.id.desc(), useCan.canUsage.desc(), formattedDate.desc()) .fetch() } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt index c7be50c..fb1fc98 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/creator/admin/calculate/CreatorAdminCalculateQueryRepository.kt @@ -66,7 +66,7 @@ class CreatorAdminCalculateQueryRepository(private val queryFactory: JPAQueryFac .and(liveRoom.beginDateTime.loe(endDate)) ) .groupBy(liveRoom.id, useCan.canUsage) - .orderBy(formattedDate.desc()) + .orderBy(liveRoom.id.desc(), useCan.canUsage.desc(), formattedDate.desc()) .fetch() }