diff --git a/admin/src/main/java/com/jinrui/reference/admin/controller/ColumnController.java b/admin/src/main/java/com/jinrui/reference/admin/controller/ColumnController.java index 934bf71..1291166 100644 --- a/admin/src/main/java/com/jinrui/reference/admin/controller/ColumnController.java +++ b/admin/src/main/java/com/jinrui/reference/admin/controller/ColumnController.java @@ -84,7 +84,7 @@ public class ColumnController { @RequestParam(value = "size", required = false, defaultValue = "10") int size, @RequestParam(value = "orderBy", required = false, defaultValue = "order") String orderBy, @RequestParam(value = "direction", required = false, defaultValue = "asc") String direction) { - return queryColumn(token, 1L, false, keyword, null, page, size, orderBy, direction); + return queryColumn(token, 1L, true, keyword, null, page, size, orderBy, direction); } @GetMapping("/diy") diff --git a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java index 253c502..97d1121 100644 --- a/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java +++ b/core/src/main/java/com/jinrui/reference/core/model/dto/news/SaveNewsDTO.java @@ -18,6 +18,7 @@ public class SaveNewsDTO { private SaveDraftColumn column; private String content; + private Integer status; public SaveNewsDTO() {} @@ -86,4 +87,12 @@ public class SaveNewsDTO { public void setContent(String content) { this.content = content; } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } } diff --git a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java index 448271b..0f0b721 100644 --- a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java +++ b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java @@ -8,8 +8,8 @@ import com.jinrui.reference.core.mapper.TagMapper; import com.jinrui.reference.core.model.dto.news.SaveDraftColumn; import com.jinrui.reference.core.model.dto.news.SaveDraftColumnItem; import com.jinrui.reference.core.model.dto.news.SaveDraftColumnVip; -import com.jinrui.reference.core.model.dto.news.SaveNewsDTO; import com.jinrui.reference.core.model.dto.news.SaveDraftTag; +import com.jinrui.reference.core.model.dto.news.SaveNewsDTO; import com.jinrui.reference.core.model.entity.Column; import com.jinrui.reference.core.model.entity.DraftColumnRel; import com.jinrui.reference.core.model.entity.DraftTagRel; @@ -229,11 +229,15 @@ public class NewsService { public ResultObject createPublish(Long editorId, SaveNewsDTO saveNewsDTO) { Long id = saveNewsDTO.getId(); Long newsId = saveNewsDTO.getId(); - News news = newsMapper.getById(id); - Long draftId = news.getDraftId(); - if (draftId != null) { - deleteDraft(draftId); + News news = null; + if (id != null) { + news = newsMapper.getById(id); + Long draftId = news.getDraftId(); + if (draftId != null) { + deleteDraft(draftId); + } } + news = new News(saveNewsDTO); news.setStatus(2); news.setEditorId(editorId); @@ -284,6 +288,10 @@ public class NewsService { log.error("保存发布新闻栏目栏目出错!", e); return ResultObject.failed(500, "服务器错误,请联系系统管理员!"); } + + // 已发布 + saveNewsDTO.setStatus(2); + saveDraft(saveNewsDTO); return ResultObject.success(); }