From b498a513dcde11c16508119c89bd7c103f2e6cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?= <806783409@qq.com> Date: Fri, 22 Mar 2019 03:45:06 +0800 Subject: [PATCH] =?UTF-8?q?wiki=E5=A2=9E=E5=8A=A0=E5=BC=80=E6=94=BE?= =?UTF-8?q?=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wiki/controller/WikiPageCommentController.java | 12 ++++++++++-- .../doc/wiki/controller/WikiPageController.java | 1 + .../doc/wiki/controller/WikiPageFileController.java | 13 +++++++++++-- .../doc/wiki/controller/WikiPageZanController.java | 12 +++++++++++- .../doc/wiki/controller/WikiSpaceController.java | 1 + 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java index b616b1ba..7d35371a 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java @@ -72,9 +72,17 @@ public class WikiPageCommentController { @PostMapping("/update") public ResponseJson update(WikiPageComment pageComment) { Long id = pageComment.getId(); - + Long pageId; + if (id != null && id > 0) { + WikiPageComment pageCommentSel = wikiPageCommentService.getById(id); + pageId = pageCommentSel.getPageId(); + } else if (pageComment.getPageId() != null) { + pageId = pageComment.getPageId(); + } else { + return DocResponseJson.warn("需指定所属页面！"); + } DocUserDetails currentUser = DocUserUtil.getCurrentUser(); - WikiPage wikiPageSel = wikiPageService.getById(pageComment.getPageId()); + WikiPage wikiPageSel = wikiPageService.getById(pageId); WikiSpace wikiSpaceSel = wikiSpaceService.getById(wikiPageSel.getSpaceId()); // 私人空间 if (Objects.equals(wikiSpaceSel.getType(), 3) && !currentUser.getUserId().equals(wikiSpaceSel.getCreateUserId())) { diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java index 5d245611..6db771a7 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java @@ -123,6 +123,7 @@ public class WikiPageController { if (wikiPageSel == null || Objects.equals(wikiPageSel.getEditType(), 1)) { return DocResponseJson.warn("当前页面不允许编辑！"); } + wikiPage.setEditType(null); wikiPage.setUpdateTime(new Date()); wikiPage.setUpdateUserId(currentUser.getUserId()); wikiPage.setUpdateUserName(currentUser.getUsername()); diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java index 3f364fce..fbee82e2 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageFileController.java @@ -54,13 +54,22 @@ public class WikiPageFileController { @PostMapping("/update") public ResponseJson update(WikiPageFile wikiPageFile) { DocUserDetails currentUser = DocUserUtil.getCurrentUser(); - WikiPage wikiPageSel = wikiPageService.getById(wikiPageFile.getPageId()); + Long id = wikiPageFile.getId(); + Long pageId; + if (id != null && id > 0) { + WikiPageFile pageFileSel = wikiPageFileService.getById(wikiPageFile.getId()); + pageId = pageFileSel.getPageId(); + } else if (wikiPageFile.getPageId() != null) { + pageId = wikiPageFile.getPageId(); + } else { + return DocResponseJson.warn("需指定修改文件的所属页面！"); + } + WikiPage wikiPageSel = wikiPageService.getById(pageId); WikiSpace wikiSpaceSel = wikiSpaceService.getById(wikiPageSel.getSpaceId()); // 私人空间 if (Objects.equals(wikiSpaceSel.getType(), 3) && !currentUser.getUserId().equals(wikiSpaceSel.getCreateUserId())) { return DocResponseJson.warn("您没有该空间的文件上传权限！"); } - Long id = wikiPageFile.getId(); if (id != null && id > 0) { wikiPageFile.setUpdateUserId(currentUser.getUserId()); wikiPageFile.setUpdateUserName(currentUser.getUsername()); diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java index b330bd29..1cc3ff4c 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageZanController.java @@ -59,7 +59,17 @@ public class WikiPageZanController { @PostMapping("/update") public ResponseJson update(WikiPageZan wikiPageZan) { DocUserDetails currentUser = DocUserUtil.getCurrentUser(); - WikiPage wikiPageSel = wikiPageService.getById(wikiPageZan.getPageId()); + Long id = wikiPageZan.getId(); + Long pageId; + if (id != null && id > 0) { + WikiPageZan wikiPageZanSel = wikiPageZanService.getById(id); + pageId = wikiPageZanSel.getPageId(); + } else if (wikiPageZan.getPageId() != null) { + pageId = wikiPageZan.getPageId(); + } else { + return DocResponseJson.warn("需指定所属页面！"); + } + WikiPage wikiPageSel = wikiPageService.getById(pageId); WikiSpace wikiSpaceSel = wikiSpaceService.getById(wikiPageSel.getSpaceId()); // 私人空间 if (Objects.equals(wikiSpaceSel.getType(), 3) && !currentUser.getUserId().equals(wikiSpaceSel.getCreateUserId())) { diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java index eeab7d75..0f63d834 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java @@ -57,6 +57,7 @@ public class WikiSpaceController { return DocResponseJson.warn("您没有该空间的编辑权！"); } wikiSpace.setUuid(null); + wikiSpace.setEditType(null); wikiSpaceService.updateById(wikiSpace); } else { wikiSpace.setUuid(RandomUtil.simpleUUID());