diff --git a/src/main/java/run/halo/app/controller/admin/api/JournalController.java b/src/main/java/run/halo/app/controller/admin/api/JournalController.java index 708518113..d4fe65f50 100644 --- a/src/main/java/run/halo/app/controller/admin/api/JournalController.java +++ b/src/main/java/run/halo/app/controller/admin/api/JournalController.java @@ -51,7 +51,7 @@ public class JournalController { @GetMapping @ApiOperation("Lists journals") - public Page pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, + public Page pageBy(@PageableDefault(sort = "createTime", direction = DESC) Pageable pageable, JournalQuery journalQuery) { Page journalPage = journalService.pageBy(journalQuery, pageable); return journalService.convertToCmtCountDto(journalPage); diff --git a/src/main/java/run/halo/app/model/dto/JournalDTO.java b/src/main/java/run/halo/app/model/dto/JournalDTO.java index 7f53d5cf4..c110cffe6 100644 --- a/src/main/java/run/halo/app/model/dto/JournalDTO.java +++ b/src/main/java/run/halo/app/model/dto/JournalDTO.java @@ -3,6 +3,7 @@ package run.halo.app.model.dto; import lombok.Data; import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.entity.Journal; +import run.halo.app.model.enums.JournalType; import java.util.Date; @@ -22,4 +23,6 @@ public class JournalDTO implements OutputConverter { private Long likes; private Date createTime; + + private JournalType type; }