From c76a3b1194f320bf84061676d14200f7e78f044e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
index 464810e..76831bc 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
@@ -42,11 +42,16 @@
@Override
public int deleteSalesLedgerByIds(Long[] ids) {
+ for (Long id : ids) {
+ if (id == null) {
+ return 1;
+ }
+ }
return commonFileMapper.deleteBatchIds(Arrays.asList(ids));
}
@Override
- public CommonFile uploadFile(MultipartFile file, Long id, String type) throws IOException {
+ public CommonFile uploadFile(MultipartFile file, Long id, Integer type) throws IOException {
// 1. 鐢熸垚姝ｅ紡鏂囦欢ID鍜岃矾寰�
String tempId = UUID.randomUUID().toString();
Path tempFilePath = Paths.get(uploadDir, tempId + "_" + file.getOriginalFilename());
--
Gitblit v1.9.3