From 207dd6aec0871f9a21d3adcc8933f455b9472bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 26 Oct 2023 18:30:37 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=97=90=EB=9F=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/cns/qna/service/CnsQnaService.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java index bc39ed2..8522831 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java @@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.transaction.Transactional; import java.time.Instant; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -73,11 +74,20 @@ public class CnsQnaService { if (entity == null) throw new CustomException(ErrorCode.DATA_NOTFIND); // 파일 삭제(논리적 삭제) - List prevFileInfos = comnFileService.getNormalFileListByGroupNo(entity.getFileGroupNo()); - List prevFileSnoList = prevFileInfos.stream().map(ComnFileModel::getFileSno).collect(Collectors.toList()); - List currentFileSnoList = rq.getFileInfos().stream().map(ComnFileModel::getFileSno).collect(Collectors.toList()); + List prevFileSnoList = new ArrayList<>(); + List currentFileSnoList = new ArrayList<>(); + if (entity.getFileGroupNo() != null) { + List prevFileInfos = comnFileService.getNormalFileListByGroupNo(entity.getFileGroupNo()); + prevFileSnoList = prevFileInfos.stream().map(ComnFileModel::getFileSno).collect(Collectors.toList()); + } + if (rq.getFileInfos() != null) { + currentFileSnoList = rq.getFileInfos().stream().map(ComnFileModel::getFileSno).collect(Collectors.toList()); + } + boolean isChange = prevFileSnoList.removeAll(currentFileSnoList); - if (isChange) comnFileService.deleteFilesByFileGroupNo(entity.getFileGroupNo()); // File 삭제 + if (isChange) { + comnFileService.deleteFiles(prevFileSnoList); // File 삭제 + } List files = rq.getFiles(); if (files != null && !files.isEmpty()) comnFileService.fileUpload(files, entity.getFileGroupNo()); // File 업로드