From 96c74369d6b258cd09dfea286baaa00244340fba Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 6 Sep 2019 12:26:24 +0800
Subject: [PATCH] Add type field for JournalDTO.

---
 .../run/halo/app/controller/admin/api/JournalController.java   | 2 +-
 src/main/java/run/halo/app/model/dto/JournalDTO.java           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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<JournalWithCmtCountDTO> pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable,
+    public Page<JournalWithCmtCountDTO> pageBy(@PageableDefault(sort = "createTime", direction = DESC) Pageable pageable,
                                                JournalQuery journalQuery) {
         Page<Journal> 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<JournalDTO, Journal> {
     private Long likes;
 
     private Date createTime;
+
+    private JournalType type;
 }