From 0021f7fe51a2c0bf39f571d3b4f035b90bd5c8aa Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Sun, 7 Feb 2021 19:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3updateFile=E6=97=B6=E7=9A=84c?=
 =?UTF-8?q?id=E4=BC=A0=E5=80=BC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/system.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/services/system.js b/src/services/system.js
index 0c26650e..6eb073f0 100644
--- a/src/services/system.js
+++ b/src/services/system.js
@@ -633,9 +633,10 @@ const system = {
         onProgressHandler(progressData);
         if(process !== 100 || !hash) return;
         socket.close();
-        const copyFile = firstCharToUpperCase({ ...file, ipfsCid: hash, size: +size, ModifyUserId: sessionStorage.userId, 
-                                              historyCurrentIpfsCid: isConflict ? hash : commitHistoryHash, 
-                                              historyPreIpfsCid
+        const copyFile = firstCharToUpperCase({ ...file, size: +size, ModifyUserId: sessionStorage.userId, 
+                                              historyCurrentIpfsCid: commitHistoryHash, 
+                                              ipfsCid: isConflict ? file.ipfsCid : hash,
+                                              historyPreIpfsCid,
                                             });
 
         const res = await fetchApi('file/updateFile', copyFile);