From df9479f870c01f13f6f528b185631d341c8018bb Mon Sep 17 00:00:00 2001
From: liuzhu <liuzhu@123.com>
Date: Mon, 9 Mar 2026 16:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=93=E5=8F=96=E5=A4=B1=E8=B4=A5=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaterialInfoServiceImpl.java |  2 +-
 .../system/service/impl/FileServiceImpl.java  | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
index 1060e39..044b87a 100644
--- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
@@ -418,7 +418,7 @@ public class MaterialInfoServiceImpl extends BaseServiceImpl<MaterialInfoMapper,
     public String catchPhoto(MultipartFile file){
         String photoStoragePath = "catch" + DateUtil.today() + "/";
         FileInfo fileInfo = fileService.upload(file, photoStoragePath, null, true, true);
-        CheckUtils.throwIfEmpty(fileInfo.getUrl(),"上传失败,请重新上传");
+        CheckUtils.throwIfNull(fileInfo,"照片上传失败");
         return fileInfo.getUrl();
     }
 
diff --git a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java
index 45bb7c5..4be6b7a 100644
--- a/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java
+++ b/wms-module-system/src/main/java/top/wms/admin/system/service/impl/FileServiceImpl.java
@@ -63,7 +63,7 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
     }
 
     @Override
-    public FileInfo upload(MultipartFile file, String path, String storageCode, Boolean createMin, Boolean store) {
+    public FileInfo upload(MultipartFile file, String path, String storageCode, Boolean createMin, Boolean store)  {
         StorageDO storage;
         if (StrUtil.isBlank(storageCode)) {
             storage = storageService.getDefaultStorage();
@@ -100,13 +100,18 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
             }
         });
         // 处理本地存储文件 URL
-        FileInfo fileInfo = uploadPretreatment.upload();
-        String domain = StrUtil.appendIfMissing(storage.getDomain(), StringConstants.SLASH);
-        fileInfo.setUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getFilename()));
-        if (StrUtil.isNotBlank(fileInfo.getThFilename())) {
-            fileInfo.setThUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getThFilename()));
-        } else {
-            fileInfo.setThUrl(fileInfo.getUrl());
+        FileInfo fileInfo = null;
+        try {
+            fileInfo = uploadPretreatment.upload();
+            String domain = StrUtil.appendIfMissing(storage.getDomain(), StringConstants.SLASH);
+            fileInfo.setUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getFilename()));
+            if (StrUtil.isNotBlank(fileInfo.getThFilename())) {
+                fileInfo.setThUrl(URLUtil.normalize(domain + fileInfo.getPath() + fileInfo.getThFilename()));
+            } else {
+                fileInfo.setThUrl(fileInfo.getUrl());
+            }
+        } catch (Exception e) {
+
         }
         return fileInfo;
     }
@@ -146,4 +151,4 @@ public class FileServiceImpl extends BaseServiceImpl<FileMapper, FileDO, FileRes
             fileResp.setStorageName("%s (%s)".formatted(storage.getName(), storage.getCode()));
         }
     }
-}
\ No newline at end of file
+}