From 7cf1abccc7f2de864ac8ea7a7db25141698de3e8 Mon Sep 17 00:00:00 2001
From: MAC <1162714483@qq.com>
Date: Mon, 6 Mar 2023 23:34:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8B=B7=E8=B4=9D=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qiwenshare/file/api/IUserFileService.java   | 2 +-
 .../com/qiwenshare/file/controller/ShareController.java  | 2 +-
 .../com/qiwenshare/file/service/UserFileService.java     | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qiwenshare/file/api/IUserFileService.java b/src/main/java/com/qiwenshare/file/api/IUserFileService.java
index 50fa426..9598a42 100644
--- a/src/main/java/com/qiwenshare/file/api/IUserFileService.java
+++ b/src/main/java/com/qiwenshare/file/api/IUserFileService.java
@@ -14,7 +14,7 @@ public interface IUserFileService extends IService<UserFile> {
 
     IPage<FileListVO> userFileList(String userId, String filePath, Long beginCount, Long pageCount);
     void updateFilepathByUserFileId(String userFileId, String newfilePath, String userId);
-    void userFileCopy(String userFileId, String newfilePath, String userId);
+    void userFileCopy(String userId, String userFileId, String newfilePath);
 
     IPage<FileListVO> getFileByFileType(Integer fileTypeId, Long currentPage, Long pageCount, String userId);
     List<UserFile> selectUserFileListByPath(String filePath, String userId);
diff --git a/src/main/java/com/qiwenshare/file/controller/ShareController.java b/src/main/java/com/qiwenshare/file/controller/ShareController.java
index a2a50ca..3b463fb 100644
--- a/src/main/java/com/qiwenshare/file/controller/ShareController.java
+++ b/src/main/java/com/qiwenshare/file/controller/ShareController.java
@@ -126,7 +126,7 @@ public class ShareController {
                 log.info("查询文件列表：" + JSON.toJSONString(userfileList));
                 String filePath = userFile.getFilePath();
                 userfileList.forEach(p->{
-                    p.setUserFileId(null);
+                    p.setUserFileId(IdUtil.getSnowflakeNextIdStr());
                     p.setUserId(userId);
                     p.setFilePath(p.getFilePath().replaceFirst(filePath + "/" + fileName, savefilePath + "/" + savefileName));
                     saveUserFileList.add(p);
diff --git a/src/main/java/com/qiwenshare/file/service/UserFileService.java b/src/main/java/com/qiwenshare/file/service/UserFileService.java
index cac65d1..c2b53b2 100644
--- a/src/main/java/com/qiwenshare/file/service/UserFileService.java
+++ b/src/main/java/com/qiwenshare/file/service/UserFileService.java
@@ -123,12 +123,14 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> imple
     }
 
     @Override
-    public void userFileCopy(String userFileId, String newfilePath, String userId) {
+    public void userFileCopy(String userId, String userFileId, String newfilePath) {
         UserFile userFile = userFileMapper.selectById(userFileId);
         String oldfilePath = userFile.getFilePath();
+        String oldUserId = userFile.getUserId();
         String fileName = userFile.getFileName();
 
         userFile.setFilePath(newfilePath);
+        userFile.setUserId(userId);
         userFile.setUserFileId(IdUtil.getSnowflakeNextIdStr());
         if (userFile.getIsDir() == 0) {
             String repeatFileName = fileDealComp.getRepeatFileName(userFile, userFile.getFilePath());
@@ -144,8 +146,8 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> imple
         newfilePath = new QiwenFile(newfilePath, fileName, true).getPath();
 
 
-        if (userFile.isDirectory()) { //为null说明是目录，则需要移动子目录
-            List<UserFile> subUserFileList = userFileMapper.selectUserFileByLikeRightFilePath(oldfilePath, userId);
+        if (userFile.isDirectory()) {
+            List<UserFile> subUserFileList = userFileMapper.selectUserFileByLikeRightFilePath(oldfilePath, oldUserId);
 
             for (UserFile newUserFile : subUserFileList) {
                 newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(oldfilePath, newfilePath));
@@ -154,6 +156,7 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> imple
                     String repeatFileName = fileDealComp.getRepeatFileName(newUserFile, newUserFile.getFilePath());
                     newUserFile.setFileName(repeatFileName);
                 }
+                newUserFile.setUserId(userId);
                 try {
                     userFileMapper.insert(newUserFile);
                 } catch (Exception e) {