ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!65 合并

Browse Source 
Merge pull request !65 from MAC/develop
This commit is contained in:
MAC 2021-07-11 12:01:49 +00:00 committed by Gitee
commit 4023e1849d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/qiwenshare/file/controller/FiletransferController.java
View File

@ -86,7 +86,7 @@ public class FiletransferController {
userFile.setUserId(sessionUserBean.getUserId()); userFile.setUserId(sessionUserBean.getUserId());
String relativePath = uploadFileDto.getRelativePath(); String relativePath = uploadFileDto.getRelativePath();
if (StringUtils.isNotEmpty(relativePath)) { if (relativePath.contains("/")) {
userFile.setFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/"); userFile.setFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/");
fileDealComp.restoreParentFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/", sessionUserBean.getUserId()); fileDealComp.restoreParentFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/", sessionUserBean.getUserId());
} else { } else {

2
src/main/java/com/qiwenshare/file/service/FiletransferService.java
View File

@ -101,7 +101,7 @@ public class FiletransferService implements IFiletransferService {
fileMapper.insert(fileBean); fileMapper.insert(fileBean);
UserFile userFile = new UserFile(); UserFile userFile = new UserFile();
String relativePath = uploadFileDto.getRelativePath(); String relativePath = uploadFileDto.getRelativePath();
if (StringUtils.isNotEmpty(relativePath)) { if (relativePath.contains("/")) {
userFile.setFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/"); userFile.setFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/");
fileDealComp.restoreParentFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/", userId); fileDealComp.restoreParentFilePath(uploadFileDto.getFilePath() + PathUtil.getParentPath(relativePath) + "/", userId);
} else { } else {