diff --git a/src/main/java/com/qiwenshare/file/service/FiletransferService.java b/src/main/java/com/qiwenshare/file/service/FiletransferService.java index ef2bc8c..75e9649 100644 --- a/src/main/java/com/qiwenshare/file/service/FiletransferService.java +++ b/src/main/java/com/qiwenshare/file/service/FiletransferService.java @@ -365,11 +365,8 @@ public class FiletransferService implements IFiletransferService { downloader.download(httpServletResponse, downloadFile); } else { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.likeRight(UserFile::getFilePath, QiwenFileUtil.formatLikePath(userFile.getFilePath() + "/" + userFile.getFileName())) - .eq(UserFile::getUserId, userFile.getUserId()) - .eq(UserFile::getDeleteFlag, 0); - List userFileList = userFileMapper.selectList(lambdaQueryWrapper); + List userFileList = userFileMapper.selectUserFileByLikeRightFilePath(userFile.getFilePath() + "/" + userFile.getFileName() + , userFile.getUserId()); List userFileIds = userFileList.stream().map(UserFile::getUserFileId).collect(Collectors.toList()); downloadUserFileList(httpServletResponse, userFile.getFilePath(), userFile.getFileName(), userFileIds); diff --git a/src/main/java/com/qiwenshare/file/service/UserFileService.java b/src/main/java/com/qiwenshare/file/service/UserFileService.java index 66e22bd..3d22f7c 100644 --- a/src/main/java/com/qiwenshare/file/service/UserFileService.java +++ b/src/main/java/com/qiwenshare/file/service/UserFileService.java @@ -161,10 +161,8 @@ public class UserFileService extends ServiceImpl impl if (extendName == null) { //为null说明是目录,则需要移动子目录 - QueryWrapper subQueryWrapper = new QueryWrapper(); - subQueryWrapper.likeRight("filePath", QiwenFileUtil.formatLikePath(oldfilePath)); - subQueryWrapper.eq("userId", userId); - List subUserFileList = userFileMapper.selectList(subQueryWrapper); + List subUserFileList = userFileMapper.selectUserFileByLikeRightFilePath(oldfilePath, userId); + for (UserFile userFile : subUserFileList) { userFile.setFilePath(userFile.getFilePath().replaceFirst(oldfilePath, newfilePath)); userFile.setUserFileId(IdUtil.getSnowflakeNextIdStr());