From cae32f8be7c42be925fe1fcb1b35eafb0939f129 Mon Sep 17 00:00:00 2001 From: bangae1 Date: Mon, 2 Jun 2025 09:58:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=99=B8=EC=82=AC=EC=9C=A0=20?= =?UTF-8?q?=EB=8C=80=EC=83=81=20=EC=A1=B0=ED=9A=8C=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kospo/svcm/repository/ContRepository.java | 9 ++++----- .../com/kospo/svcm/service/impl/ContServiceImpl.java | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/kospo/svcm/repository/ContRepository.java b/src/main/java/com/kospo/svcm/repository/ContRepository.java index 10ecd28..4d399ec 100644 --- a/src/main/java/com/kospo/svcm/repository/ContRepository.java +++ b/src/main/java/com/kospo/svcm/repository/ContRepository.java @@ -30,8 +30,8 @@ public interface ContRepository extends JpaRepository { String getRegSabun(); } @Query(value = "select c.contNo as contNo, " + - " p.cateCd as cateCd, " + - " p.cateNm as cateNm, " + + " c.cateCd as cateCd, " + + " c.cateNm as cateNm, " + " c.compNm as compNm, " + " c.title as title, " + " c.signDt as signDt, " + @@ -41,9 +41,8 @@ public interface ContRepository extends JpaRepository { " c.regDt as regDt, " + " c.regNm as regNm, " + " c.regSabun as regSabun " + - "from Cont c inner join Prcs p " + - "on c.prcsNo = p.prcsNo " + - "and c.regSabun = :sabun " + + "from Cont c " + + "where c.regSabun = :sabun " + "and (:contStatCd is null or :contStatCd = '' or c.contStatCd = :contStatCd) " + "and c.signDt between :signSdt and :signEdt order by c.contNo desc") Page findBySearch(String sabun, String contStatCd, String signSdt, String signEdt, Pageable pageable); diff --git a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java index 89fdcfa..d76035d 100644 --- a/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java +++ b/src/main/java/com/kospo/svcm/service/impl/ContServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; @@ -130,7 +131,8 @@ public class ContServiceImpl implements ContService { .build()); if(contSaveRequest.getContAtts() != null && contSaveRequest.getContAtts().size() > 0){ - cont.setContAtts(contAttRepository.saveAll(contSaveRequest.getContAtts().stream().map(contAttSaveRequest -> { + + cont.setContAtts(contAttRepository.saveAll(contSaveRequest.getContAtts().stream().filter(Objects::nonNull).map(contAttSaveRequest -> { String pNm = CommonUtils.dateFormat("yyyyMMddHHmmssSSS"); fileUtils.fileUpload(filePath + pNm, contAttSaveRequest.getData()); return ContAtt.builder()