From 19d820ea50c9216443d078f1fcd1967ed698ee7f Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Tue, 14 Dec 2021 13:40:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=9D=EC=82=B0=EB=85=84=EB=8F=84=20?=
 =?UTF-8?q?=ED=95=98=EB=82=98=EB=A7=8C=20=EC=9E=85=EB=A0=A5=ED=95=B4?=
 =?UTF-8?q?=EB=8F=84=20=EA=B2=80=EC=83=89=EA=B0=80=EB=8A=A5=ED=95=98?=
 =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/nlib/search/getDetailedSearchFormPopup.jsp       | 4 ++--
 src/main/webapp/js/search/reference.js                   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
index 4e62b996..985493f0 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
@@ -257,7 +257,7 @@ function d_search(){
 	var ageCount=0;
 	var filter_myList = $("#d_filter_mylist").val();
 	var collection ="";
-	if($("#d_creatYyyyStart").val() != "" && $("#d_creatYyyyEnd").val() != "")
+	if($("#d_creatYyyyStart").val() != "" || $("#d_creatYyyyEnd").val() != "")
 	{
 		$("#d_filter_creatYyyy").val("date");
 		filter_myList+= "creat_date,";
@@ -386,7 +386,7 @@ function detailPopClose(){
                 <input type="hidden" id="d_filter_category" name="filter_category">
                 <input type="hidden" id="d_filter_mylist" name="filter_mylist">
                 <input type="hidden" id="d_filter_creatYyyy" name="filter_creatYyyy" value="">
-                <input type="hidden" id="csrfToken" name="csrfToken" value="${csrfToken}">
+                <input type="hidden" id="csrfToken" name="csrfToken" value="<c:out value='${csrfToken}'/>">
                 <div class="scroll-wrap">
                     <fieldset>
                         <legend>상세검색 입력폼</legend>
diff --git a/src/main/webapp/js/search/reference.js b/src/main/webapp/js/search/reference.js
index 841c7428..f16dbf62 100644
--- a/src/main/webapp/js/search/reference.js
+++ b/src/main/webapp/js/search/reference.js
@@ -78,14 +78,9 @@ function filter_creatYyyyAply(){
 		//생산년도 검색
 		if($("#m-year-2").is(':checked') == true)
 		{
-			if($("#creatYyyyStart").val() == "")
+			if($("#creatYyyyStart").val() == "" && $("#creatYyyyEnd").val() == "")
 			{
-				alert("생산년도 검색 시작일자를 입력해주세요.");
-				return false;
-			}
-			if($("#creatYyyyEnd").val() == "")
-			{
-				alert("생산년도 검색 종료일자를 입력해주세요.");
+				alert("생산년도 검색년도를 입력해주세요.");
 				return false;
 			}
 			$("#filter_creatYyyy").val("date");