Merge branch 'dev' into fix/#348_belljun3395

YAPP-Github · Aug 17, 2024 · a1bea82 · a1bea82
2 parents 9e1b0ef + 7d01f3c
commit a1bea82
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/api-repo/src/main/kotlin/com/few/api/repo/dao/article/ArticleDao.kt b/api-repo/src/main/kotlin/com/few/api/repo/dao/article/ArticleDao.kt
@@ -85,12 +85,13 @@ class ArticleDao(
         MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.DAY_COL.`as`(SelectWorkBookArticleRecord::day.name)
     )
         .from(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE)
-        .leftJoin(ArticleMst.ARTICLE_MST)
+        .join(ArticleMst.ARTICLE_MST)
         .on(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.ARTICLE_ID.eq(ArticleMst.ARTICLE_MST.ID))
         .join(ArticleIfo.ARTICLE_IFO)
         .on(ArticleMst.ARTICLE_MST.ID.eq(ArticleIfo.ARTICLE_IFO.ARTICLE_MST_ID))
         .where(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.WORKBOOK_ID.eq(query.workbookId))
         .and(ArticleMst.ARTICLE_MST.DELETED_AT.isNull)
+        .orderBy(MappingWorkbookArticle.MAPPING_WORKBOOK_ARTICLE.DAY_COL)
         .query
 
     fun insertFullArticleRecord(command: InsertFullArticleRecordCommand): Long {