From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 6269308..947456e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -99,8 +99,6 @@
.collect(Collectors.joining(","));
supervision.setImages(image);
}
-
-
supervisionMapper.insert(supervision);
return result;
}
@@ -171,6 +169,17 @@
//������������������������������������������������������������������������
if (files.size() > 0) {
+ //���������������������������������������������
+ String[] oldImages = supervisionMapper.selectById(supervision.getId()).getImages().split(",");
+ for (String image : oldImages) {
+ String realPath = path + File.separator + image;
+ File file = new File(realPath);
+ if (file.exists() && file.isFile()) {
+ file.delete();
+ }
+ }
+
+
for (MultipartFile file : files) {
//������������������������
String fileType = file.getContentType();
@@ -195,14 +204,7 @@
if (!ObjectUtils.isEmpty(images)) {
- //���������������������������������������������
- for (String image : images) {
- String realPath = path + File.separator + image;
- File file = new File(realPath);
- if (file.exists() && file.isFile()) {
- file.delete();
- }
- }
+
String image = images.stream()
.map(String::valueOf)
.collect(Collectors.joining(","));
--
Gitblit v1.8.0