manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wiki优化

Browse Source
This commit is contained in:
暮光：城中城
2020-08-02 18:02:37 +08:00
parent e281b5d47d
commit 6d2e24f455
19 changed files with 1407 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiCommonController.java
View File

@@ -2,6 +2,8 @@ package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
@@ -32,7 +34,6 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.List;
import java.util.Optional;
/**
@@ -67,8 +68,10 @@ public class WikiCommonController {
queryWrapper.like("user_name", search).or().like("user_no", search)
.or().like("email", search);
queryWrapper.select("id", "user_name");
List<UserInfo> userInfoList = userInfoService.list(queryWrapper);
return DocResponseJson.ok(userInfoList);
// 搜索最多返回20条
IPage<UserInfo> page = new Page<>(1, 20, false);
userInfoService.page(page, queryWrapper);
return DocResponseJson.ok(page);
}
@GetMapping("/file")

5
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
View File

@@ -161,8 +161,7 @@ public class WikiPageController {
@PostMapping("/changeParent")
public ResponseJson<Object> changeParent(WikiPage wikiPage, Integer beforeSeq, Integer afterSeq) {
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
Long id = wikiPage.getId();
WikiPage wikiPageSel = wikiPageService.getById(id);
WikiPage wikiPageSel = wikiPageService.getById(wikiPage.getId());
// 编辑权限判断
WikiSpace wikiSpaceSel = wikiSpaceService.getById(wikiPageSel.getSpaceId());
String canEdit = wikiPageAuthService.canEdit(wikiSpaceSel, wikiPageSel.getEditType(), wikiPageSel.getId(), currentUser.getUserId());
@@ -175,7 +174,7 @@ public class WikiPageController {
wikiPageUp.setUpdateTime(new Date());
wikiPageUp.setUpdateUserId(currentUser.getUserId());
wikiPageUp.setUpdateUserName(currentUser.getUsername());
wikiPageService.changeParent(wikiPage, beforeSeq, afterSeq);
wikiPageService.changeParent(wikiPageUp, beforeSeq, afterSeq);
return DocResponseJson.ok();
}