From 92fb8de80f917af289237568e1782cf03a18bc7c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 18 四月 2023 10:35:52 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/UploadService.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 5c05c6b..209803e 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -93,7 +93,7 @@
 
             MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
             if (null != old) {
-                mf.setMsg("宸插叆搴�");
+                mf.setMsg("宸插瓨鍦�");
             }
         }
     }
@@ -101,21 +101,18 @@
     /**
      * Excel鍏ュ簱
      */
-    private String excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
+    private void excelLoader(List<MetaFileEntity> list, HttpServletRequest req) {
         List<MetaFileEntity> xlsList = getExcelFiles(list);
         if (xlsList.isEmpty()) {
-            return "";
+            return;
         }
 
-        String guid = null;
         try {
             MetaFileEntity meta = getExcelMeta(xlsList);
-            guid = fmeService.excelLoader(meta, req);
+            String guid = fmeService.excelLoader(meta, req);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }
-
-        return guid;
     }
 
     /**
@@ -245,7 +242,7 @@
 
         MetaEntity old = metaService.selectByGuid(mf.getGuid(), tabName);
         if (null != old) {
-            mf.setMsg("宸插叆搴�");
+            mf.setMsg("宸插瓨鍦�");
             return;
         }
 
@@ -306,6 +303,9 @@
                 case StaticData.MPT:
                     copyMultiFile(mf, StaticData.MPT_EXT);
                     break;
+                case StaticData.JPG:
+                    copyMultiFile(mf, StaticData.JPG_EXT);
+                    break;
                 case StaticData.IMG:
                     copyMultiFile(mf, StaticData.IMG_EXT);
                     break;
@@ -349,7 +349,7 @@
 
         MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
         if (null != old) {
-            mf.setMsg("宸插叆搴�");
+            mf.setMsg("宸插瓨鍦�");
             file.delete();
             return 0;
         }
@@ -418,7 +418,7 @@
 
         MetaEntity old = metaService.selectByGuid(mf.getGuid(), null);
         if (null != old) {
-            mf.setMsg("宸插叆搴�");
+            mf.setMsg("宸插瓨鍦�");
             FileHelper.deleteFiles(file);
             return;
         }

--
Gitblit v1.9.3