Merge branch 'develop' into fix/reservation-auth

wafflestudio · Sep 22, 2023 · f369e82 · f369e82
2 parents abc27bb + c82ea86
commit f369e82
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/kotlin/com/wafflestudio/csereal/core/main/database/MainRepository.kt b/src/main/kotlin/com/wafflestudio/csereal/core/main/database/MainRepository.kt
@@ -64,7 +64,7 @@ class MainRepositoryImpl(
             )
         ).from(noticeEntity)
             .where(noticeEntity.isDeleted.eq(false), noticeEntity.isPrivate.eq(false))
-            .orderBy(noticeEntity.isPinned.desc()).orderBy(noticeEntity.createdAt.desc())
+            .orderBy(noticeEntity.createdAt.desc())
             .limit(6).fetch()
     }
 
@@ -82,7 +82,7 @@ class MainRepositoryImpl(
             .rightJoin(tagInNoticeEntity).on(noticeTagEntity.tag.eq(tagInNoticeEntity))
             .where(noticeTagEntity.tag.name.eq(tagEnum))
             .where(noticeEntity.isDeleted.eq(false), noticeEntity.isPrivate.eq(false))
-            .orderBy(noticeEntity.isPinned.desc()).orderBy(noticeTagEntity.notice.createdAt.desc())
+            .orderBy(noticeTagEntity.notice.createdAt.desc())
             .limit(6).distinct().fetch()
     }