From a929225ed52c1987c20b36cf699c68e401c27cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Wed, 3 Sep 2025 15:11:01 +0800
Subject: [PATCH] =?UTF-8?q?09-03-=E4=BF=AE=E5=A4=8D=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TenderSupplierInputController.java     |  4 +++-
 .../service/impl/TenderSupplierInputServiceImpl.java  | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
index 69e6a897..ab788e61 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/controller/TenderSupplierInputController.java
@@ -17,6 +17,7 @@ import org.dromara.system.service.ISysOssService;
 import org.dromara.tender.domain.TenderSupplierInput;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -122,11 +123,12 @@ public class TenderSupplierInputController extends BaseController {
     /**
      * 修改供应商入库
      */
+    @Transactional
     @SaCheckPermission("supplierInput:supplierInput:edit")
     @Log(title = "供应商入库", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(TenderSupplierInputBo bo,@RequestPart("file") MultipartFile file) {
+    public R<Void> edit(@RequestBody TenderSupplierInputBo bo,@RequestPart(value = "file",required = false) MultipartFile file) {
         return toAjax(tenderSupplierInputService.updateByBo(bo,file));
     }
 
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
index 6ec73ef9..4330dcc9 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/tender/service/impl/TenderSupplierInputServiceImpl.java
@@ -128,11 +128,12 @@ public class TenderSupplierInputServiceImpl extends ServiceImpl<TenderSupplierIn
     public Boolean updateByBo(TenderSupplierInputBo bo,MultipartFile file) {
         TenderSupplierInput update = MapstructUtils.convert(bo, TenderSupplierInput.class);
         TenderSupplierInput byId = getById(update.getId());
-        ossService.deleteWithValidByIds(List.of(byId.getFileId()), false);
-
-        SysOssVo sysOssUploadVo = ossService.upload(file, ossService.minioFileName(SupplierInput, file));
-        update.setInputFile(sysOssUploadVo.getUrl());
-        update.setFileId(Long.valueOf(sysOssUploadVo.getOssId()));
+        if (file != null) {
+            ossService.deleteWithValidByIds(List.of(byId.getFileId()), false);
+            SysOssVo sysOssUploadVo = ossService.upload(file, ossService.minioFileName(SupplierInput, file));
+            update.setInputFile(sysOssUploadVo.getUrl());
+            update.setFileId(Long.valueOf(sysOssUploadVo.getOssId()));
+        }
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }