From 3445329d483599ae4b252ba7b12a2d09379faaf1 Mon Sep 17 00:00:00 2001
From: "gayoun.park" <gayoun.park@tf.dabeeo.com>
Date: Tue, 27 Jan 2026 21:31:38 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=81=EC=83=81=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B2=BD=EB=A1=9C=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

---
 .../mapsheet/service/MapSheetMngService.java  | 37 ++++++++++++++-----
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
index cc2f55fc..cab42d71 100644
--- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
@@ -182,12 +182,19 @@ public class MapSheetMngService {
       MngFilesDto filesDto =
           mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
       String referPath = filesDto.getFilePath();
-      uploadPath =
-          Paths.get(referPath).getParent().getParent().toString()
-              + "/"
-              + errDto.getRefMapSheetNum()
-              + "/"
-              + errDto.getUuid();
+      Path path = Paths.get(referPath);
+      boolean isFiveDigitNumber =
+          path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
+
+      log.info("isFiveDigitNumber : " + isFiveDigitNumber);
+      if (isFiveDigitNumber) {
+        uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum();
+      } else {
+        uploadPath =
+            Paths.get(referPath).getParent().getParent().toString()
+                + "/"
+                + errDto.getRefMapSheetNum();
+      }
     }
 
     // 업로드 경로 확인(없으면 생성)
@@ -198,6 +205,7 @@ public class MapSheetMngService {
     tfwTargetPath = Paths.get(uploadPath).resolve(tfwFile.getOriginalFilename());
     tifTargetPath = Paths.get(uploadPath).resolve(tifFile);
 
+    log.info("tfwTargetPath : " + tfwTargetPath.toString());
     if (!Files.exists(tifTargetPath)) {
       return new DmlReturn("fail", "TIF 파일이 정상적으로 업로드 되지 않았습니다. 확인해주세요.");
     }
@@ -390,10 +398,19 @@ public class MapSheetMngService {
       MngFilesDto filesDto =
           mapSheetMngCoreService.findYyyyToMapSheetFilePathRefer(errDto.getMngYyyy());
       String referPath = filesDto.getFilePath();
-      uploadPath =
-          Paths.get(referPath).getParent().getParent().toString()
-              + "/"
-              + errDto.getRefMapSheetNum();
+      Path path = Paths.get(referPath);
+      boolean isFiveDigitNumber =
+          path.getFileName() != null && path.getFileName().toString().matches("\\d{5}");
+
+      log.info("isFiveDigitNumber : " + isFiveDigitNumber);
+      if (isFiveDigitNumber) {
+        uploadPath = Paths.get(referPath).getParent().toString() + "/" + errDto.getRefMapSheetNum();
+      } else {
+        uploadPath =
+            Paths.get(referPath).getParent().getParent().toString()
+                + "/"
+                + errDto.getRefMapSheetNum();
+      }
     }
 
     upAddReqDto.setFinalPath(uploadPath + "/");