From 7af7e692cbd26efca3fab9bd8c440a062dbcb649 Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Thu, 25 Jul 2024 15:40:25 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8F=90=EA=B8=B0=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=EC=84=9C=20=EA=B2=B0=EA=B3=BC=20=EB=93=B1=EB=A1=9D=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=B2=98=EB=A6=AC=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/adds/nims/web/AddsNimsController.java    |  3 ++-
 .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp       | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
index 284e936..70872dd 100644
--- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
@@ -247,6 +247,8 @@ public class AddsNimsController extends ApplicationController {
                     )
                 )
             );
+        }else {
+            mav.addObject("dsuseRsltImgList", "[]");
         }
 
         return mav
@@ -268,7 +270,6 @@ public class AddsNimsController extends ApplicationController {
     //-------------------------------------------------------------------------------------------------
     // 보고 확인 처리
     //-------------------------------------------------------------------------------------------------
-    // dsuseMgtMappingList	= "/dsuseMgtMapping-list.do"
     @RequestMapping(value = "/dsuseMgtMapping-info.do", name = "페기 보고 확인 등록")
     public ModelAndView getDsuseMgtMappingInfo(DsuseMappingInfo dsuseMappingInfo) {
         ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-info");
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
index 748edb7..ede7801 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
@@ -47,13 +47,13 @@
 <%--			<label for="bssh--${pageName}">폐기 정보</label>--%>
 			<div class="row my-1 mx-4 g-1 border-card rounded-3">
 				<div class="col-md-4">
-					<label for="hdrDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기일자</label>
-					<input type="text" class="form-control w-45 form-date" id="hdrDe--${pageName}" name="hdrDe" data-fmt-type="day" data-map="hdrDe" autocomplete="off" title="종료 날짜 선택" />
+					<label for="hdrDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급일자</label>
+					<input type="text" class="form-control w-45 form-date" id="hdrDe--${pageName}" name="hdrDe" data-fmt-type="day" data-map="hdrDe" autocomplete="off" title="취급일자 선택" />
 					<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
 				</div>
 				<div class="col-md-8">
 					<label for="dsuseDe--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">폐기일자</label>
-					<input type="text" class="form-control w-px-130 form-date" id="dsuseDe--${pageName}" name="dsuseDe" data-fmt-type="day" data-map="dsuseDe" autocomplete="off" title="종료 날짜 선택" />
+					<input type="text" class="form-control w-px-130 form-date" id="dsuseDe--${pageName}" name="dsuseDe" data-fmt-type="day" data-map="dsuseDe" autocomplete="off" title="폐기일자 선택" />
 					<button type="button" class="bx bx-lg bx-calendar bg-white"></button>
 					<span style="display: none; padding-left: 10px; font-weight: bold; color: red; align-items: center" id="spnDsuseDe">폐기일자 변경 불가[다른 폐기관리에서 폐기사진 사용중]</span>
 				</div>
@@ -183,7 +183,7 @@
 		 */
 		const fnRsltImgList = (list, isOnload) => {
 			// onload시 이미지가 있는지 여부 체크
-			if(isOnload)	isOnloadExistRsltImg = list[0].SELF_YN === 'Y';
+			if(isOnload)	isOnloadExistRsltImg = list[0]?.SELF_YN === 'Y';
 			if(!list || list.length === 0)	return;
 
 			// 폐기결과 이미지를 등록한 폐기관리 ID면 skip - 이미지 추가 삭제 가능
@@ -410,8 +410,6 @@
 
 		// DataTables에 스크롤이 맨 밑으로 이동했을 때 이벤트
 		$P.scrollDataList = () => {
-			
-
 			$P.control.load($P.control.query.pageNum + 1);
 		}
 
@@ -589,6 +587,7 @@
 		// 폐기결과이미지 저장 목록 조회 셋
 		fnRsltImgList(${dsuseRsltImgList}, true);
 
+
 		// 취급일자 및 페기일자에 값이 없는 경우 당일로 초기화.
 		if (($P.control.getValue("dsuseDe") == null || $P.control.getValue("dsuseDe") == "") &&  
 				($P.control.getValue("hdrDe") == null || $P.control.getValue("hdrDe") == "")){