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

!107 代码合并

Browse Source 
Merge pull request !107 from MAC/develop
This commit is contained in:
MAC 2022-03-22 04:34:03 +00:00 committed by Gitee
commit 901f2f758d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/qiwenshare/file/service/UserFileService.java
View File

@ -22,6 +22,7 @@ import com.qiwenshare.file.mapper.UserFileMapper;
import com.qiwenshare.file.vo.file.FileListVo;
import com.qiwenshare.ufop.util.UFOPUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -103,9 +104,6 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
@Override
public void updateFilepathByFilepath(String oldfilePath, String newfilePath, String fileName, String extendName, long userId) {
if ("null".equals(extendName)){
extendName = null;
}
List<UserFile> userFileList = selectUserFileListByPath(newfilePath, userId);
List<String> userFileNameList = userFileList.stream().map(UserFile::getFileName).collect(Collectors.toList());
if (userFileNameList != null && userFileNameList.size() > 0 && userFileNameList.contains(fileName)) {
@ -124,7 +122,7 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
oldfilePath = oldfilePath.replace("%", "\\%");
oldfilePath = oldfilePath.replace("_", "\\_");
if (extendName == null) { //为null说明是目录，则需要移动子目录
if (StringUtils.isEmpty(extendName)) { //为空说明是目录，则需要移动子目录
userFileMapper.updateFilepathByFilepath(oldfilePath, newfilePath, userId);
}