From f22194753fb077f91d81d4987378963634d1e604 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Mon, 3 Apr 2023 17:51:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?=
 =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?=
 =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?=
 =?UTF-8?q?=EC=9B=B9=EC=A0=91=EA=B7=BC=EC=84=B1=20=EB=8C=80=EB=B9=84=20?=
 =?UTF-8?q?=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adjst/web/AdjstReqWebController.java      |  3 +-
 .../WEB-INF/jsp/web/com/webCommonFooter.jsp   |  5 ++-
 .../kccadr/accdnt/ai/adjstIncidentList.jsp    | 37 ++++++++++++++-----
 .../kccadr/accdnt/ars/adjstReqStatusList.jsp  |  2 +-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
index 25b5c40e..94290cc1 100644
--- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
+++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java
@@ -582,7 +582,8 @@ public class AdjstReqWebController {
 		 * @ 조정상태를 신청전 - 접수후 - 종결 이렇게 하고 써보자. 다른구조 필요하면 나중에 바꾸지뭐
 		 */
 		
-		return "/web/kccadr/adjst/adjstReq1Regist";
+//		return "/web/kccadr/adjst/adjstReq1Regist";
+		return "redirect:/web/kccadr/adjst/adjstReqRegistInformation.do";
 	}
 
 	/**
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp
index 2b0cbf0c..10c8fa17 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp
@@ -62,8 +62,9 @@ function footerSiteLinkPageGo (){
 							<option value="https://gongu.copyright.or.kr">공유마당</option>
 							<option value="https://www.olis.or.kr/olis/olisMain.do">OLIS(오픈소스SW라이선스)</option>
 							<!-- <option value="SITE007">OLIS(오픈소스SW라이선스)</option> -->
-							<option value="http://edu-copyright.or.kr">원격교육연수원</option>
-							<option value="http://edulife.copyright.or.kr">원격평생교육원</option>
+							<!-- <option value="http://edu-copyright.or.kr">원격교육연수원</option>
+							<option value="http://edulife.copyright.or.kr">원격평생교육원</option> -->
+							<option value="https://www.edu-copyright.or.kr">저작권e배움터</option>
 							<option value="http://www.cros.or.kr">저작권 등록</option>
 							<option value="http://www.swes.or.kr">온라인 임치</option>
 							<option value="https://cras.copyright.or.kr/front/right/comm/main_.do">저작권 인증</option>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp
index 711c7be0..5e0f9f15 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp
@@ -79,7 +79,6 @@
 
     function fncGoCreate(){
         var listForm = document.listForm ;
-        //listForm.action = "<c:url value='/web/kccadr/adjst/adjstReq1Regist.do'/>"; // 신청서작성 메뉴 URL로 수정
         listForm.action = "<c:url value='/web/kccadr/adjst/adjstReqRegistInformation.do'/>";
         listForm.submit();
     }
@@ -227,16 +226,22 @@
                         		<%-- 종결상세 --%>
 		                        <td class="td_subscriber">
 		                        	<span class="m_th_text">신청인</span>
-		                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
+		                        	<c:if test="${not empty list.appliCantNm}">
+		                            	<a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
+		                            </c:if>
 		                        </td>
 		                        <td class="td_respondent">
 		                        	<span class="m_th_text">피신청인</span>
-		                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
+		                        	<c:if test="${not empty list.resPonDentNm}">
+		                            	<a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
+		                            </c:if>
 		                        </td>
 		                        <td class="td_tit">
 		                        	<div class="hover_content_wrap">
 			                        	<span class="read_only m_th_text">신청내용</span>
-			                            <a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+			                        	<c:if test="${not empty fn:trim(list.ccTy)}">
+			                            	<a href="#none" onclick="fncCloseDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+			                            </c:if>
 		                            	<c:if test="${!empty list.reqCn1}">
 			                            	<div class="hover_content_box">
 			                            		<c:out value="${list.reqCn1}"/>
@@ -248,16 +253,22 @@
                         	<c:when test="${list.statCd eq '101050' or (list.statCd >= '201010' and list.statCd <= '309050')}">
 		                        <td class="td_subscriber">
 		                        	<span class="m_th_text">신청인</span>
-		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
+		                        	<c:if test="${not empty list.appliCantNm}">
+		                            	<a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.appliCantNm}"/></a>
+		                            </c:if>
 		                        </td>
 		                        <td class="td_respondent">
 		                        	<span class="m_th_text">피신청인</span>
-		                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
+		                        	<c:if test="${not empty list.resPonDentNm}">
+		                            	<a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><c:out value="${list.resPonDentNm}"/></a>
+	                            	</c:if>
 		                        </td>
 		                        <td class="td_tit">
 		                        	<div class="hover_content_wrap">
 			                        	<span class="read_only m_th_text">신청내용</span>
-			                            <a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+			                        	<c:if test="${not empty fn:trim(list.ccTy)}">
+			                            	<a href="#none" onclick="fncGoingDetail('${list.adrSeq}', '${list.adrSn}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+			                            </c:if>
 		                            	<c:if test="${!empty list.reqCn1}">
 			                            	<div class="hover_content_box">
 			                            		<c:out value="${list.reqCn1}"/>
@@ -270,16 +281,22 @@
                         	<c:otherwise>
 		                        <td class="td_subscriber">
 		                        	<span class="m_th_text">신청인</span>
-		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.appliCantNm}"/></a>
+		                        	<c:if test="${not empty list.appliCantNm}">
+		                            	<a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.appliCantNm}"/></a>
+		                            </c:if>
 		                        </td>
 		                        <td class="td_respondent">
 		                        	<span class="m_th_text">피신청인</span>
-		                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.resPonDentNm}"/></a>
+		                        	<c:if test="${not empty list.resPonDentNm}">
+		                            	<a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><c:out value="${list.resPonDentNm}"/></a>
+		                            </c:if>
 		                        </td>
 		                        <td class="td_tit">
 		                        	<div class="hover_content_wrap">
 			                        	<span class="read_only m_th_text">신청내용</span>
-			                            <a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+			                        	<c:if test="${not empty fn:trim(list.ccTy)}">
+			                            	<a href="#none" onclick="fncGoDetail('${list.adrSeq}');"><kc:code codeId="CC002" code="${list.ccTy}"/></a>
+			                            </c:if>
 		                            	<c:if test="${!empty list.reqCn1}">
 			                            	<div class="hover_content_box">
 			                            		<c:out value="${list.reqCn1}"/>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/adjstReqStatusList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/adjstReqStatusList.jsp
index baa4058b..1d7053b6 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/adjstReqStatusList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/adjstReqStatusList.jsp
@@ -40,7 +40,7 @@ c c <%@ page contentType="text/html; charset=utf-8"%>
 
         function fncGoCreate(){
             var listForm = document.listForm ;
-            listForm.action = "<c:url value='/web/kccadr/adjst/adjstReq1Regist.do'/>";
+            listForm.action = "<c:url value='/web/kccadr/adjst/adjstReqRegistInformation.do'/>";
             listForm.submit();
         }
     </script>