From b4e4e84f8a0d3abe684ab3dc24d5db37ed4f1458 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 20:20:49 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/all/BaseUploadService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 9129888..283f4af 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -236,16 +236,19 @@
             return null;
         }
 
-        return getMapperFiles(files, meta);
+        return getMapperFiles(files, meta, subPath);
     }
 
     /**
      * 鑾峰彇鏄犲皠鏂囦欢
      */
-    private List<MetaFileEntity> getMapperFiles(File[] files, MetaFileEntity meta) {
+    private List<MetaFileEntity> getMapperFiles(File[] files, MetaFileEntity meta,String subPath) {
         List<MetaFileEntity> list = new ArrayList<>();
         for (File f : files) {
-            
+            boolean isGdb = isGdbFile(f);
+            if (!isGdb && f.isDirectory()) {
+                continue;
+            }
 
             String fileName = FileHelper.getFileName(f.getPath());
             String extName = FileHelper.getExtension(fileName);
@@ -257,7 +260,7 @@
             mf.setName(fileName);
             mf.setExtName(extName);
             mf.setSizes(FileHelper.sizeToMb(f.length()));
-            //mf.setPath(subPath + File.separator + fileName);
+            mf.setPath(f.getPath().substring(subPath.length()));
             mf.setGuid(FileHelper.getFileMd5(f.getPath()));
         }
 

--
Gitblit v1.9.3