From 2f19b571c3898dc00ef07ae792ddaaf5b27d2432 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 12 一月 2023 17:42:55 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index e5d69ba..6827384 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -328,7 +328,7 @@
      */
     private String findPathByGuid(List<MetaFileEntity> list, MetaFileEntity mf) {
         for (MetaFileEntity meta : list) {
-            if (meta.getGuid().equals(mf.getGuid())) {
+            if (meta.getGuid().equals(mf.getGuid()) && !meta.getPath().equals(mf.getPath())) {
                 return meta.getPath();
             }
         }
@@ -407,7 +407,10 @@
         for (MetaFileEntity mf : list) {
             boolean isXls = StaticData.XLS.equals(mf.getExtName()) || StaticData.XLSX.equals(mf.getExtName());
             if (mf.getRows() > -1 && isXls) {
-                xlsList.add(mf);
+                MetaEntity old = metaService.selectByGuid(mf.getGuid());
+                if (null == old) {
+                    xlsList.add(mf);
+                }
             }
         }
 

--
Gitblit v1.9.3