From 9b2fbfa4475540fb18d69aac927873dc343d008f Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 27 Apr 2023 14:04:24 +0900 Subject: [PATCH 1/2] =?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=EA=B3=A0?= =?UTF-8?q?=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=EC=A0=84=EC=9E=90?= =?UTF-8?q?=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=202023-04-26=201.?= =?UTF-8?q?=20=EC=84=BC=ED=84=B0=EC=9E=A5=20->=20=EB=B3=B8=EB=B6=80?= =?UTF-8?q?=EC=9E=A5=20=EC=9C=BC=EB=A1=9C=20=EB=AA=85=EC=B9=AD=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B6=80=ED=83=81=EB=93=9C=EB=A6=BD=EB=8B=88?= =?UTF-8?q?=EB=8B=A4.=20=09=3D>=20=EC=8B=A4=EC=84=9C=EB=B2=84=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=09=09=EC=BD=94=EB=93=9C=EA=B4=80=EB=A6=AC=20->=20?= =?UTF-8?q?=EC=A0=84=EC=9E=90=EC=A1=B0=EC=A0=95=20->=20=EC=A7=81=EC=B1=85?= =?UTF-8?q?=20->=20=EC=84=BC=ED=84=B0=EC=9E=A5=EC=9D=84=20=EB=B3=B8?= =?UTF-8?q?=EB=B6=80=EC=9E=A5=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95=202.?= =?UTF-8?q?=20=EC=84=BC=ED=84=B0=EC=9E=A5=20=EC=95=84=EB=9E=98=EC=9D=98=20?= =?UTF-8?q?=EA=B2=B0=EC=9E=AC=EB=8C=80=EA=B8=B0=20=EB=8A=94=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=EB=8C=80=EA=B8=B0(=EC=A0=84=EA=B2=B0)=20=EB=A1=9C=20?= =?UTF-8?q?=EB=AA=85=EC=B9=AD=20=EB=B3=80=EA=B2=BD=EB=B6=80=EB=B6=80?= =?UTF-8?q?=ED=83=81=EB=93=9C=EB=A6=BD=EB=8B=88=EB=8B=A4.=20=09=3D>=20?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C=20?= =?UTF-8?q?3.=20=EC=9C=84=EC=9B=90=EC=9E=A5=EA=B9=8C=EC=A7=80=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=EA=B0=80=20=EC=98=AC=EB=9D=BC=EA=B0=80=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9C=BC=EB=AF=80=EB=A1=9C,=20=EC=84=BC=ED=84=B0?= =?UTF-8?q?=EC=9E=A5=20=EB=92=A4=EC=97=90=20=EC=9E=88=EB=8A=94=20=ED=99=94?= =?UTF-8?q?=EC=82=B4=ED=91=9C=EC=99=80=20=EC=9C=84=EC=9B=90=EC=9E=A5=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=9D=80=20=EC=82=AD=EC=A0=9C=20=EB=B6=80?= =?UTF-8?q?=ED=83=81=EB=93=9C=EB=A6=BD=EB=8B=88=EB=8B=A4.=20=09=3D>=20=09?= =?UTF-8?q?=091.=20=EC=A0=95=EC=83=81=EC=A0=81=EC=9D=B8=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=20=ED=94=84=EB=A1=9C=EC=84=B8=EC=8A=A4=EB=A5=BC=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EB=8A=94=20=EB=B0=A9=EB=B2=95=20=09?= =?UTF-8?q?=09=09=EC=A0=91=EC=88=98=EA=B2=B0=EC=9E=AC=20=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=20=EC=8B=9C=20=EC=9C=84=EC=9B=90=EC=9E=A5=EC=9D=80=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EB=90=9C=20=EC=8B=9C=EC=A0=90=20=EB=B3=B4?= =?UTF-8?q?=EB=8B=A4=20=09=09=09=EC=9D=B4=ED=9B=84=EC=97=90=20=EC=98=AC?= =?UTF-8?q?=EB=9D=BC=EC=98=A8=20=EA=B2=B0=EC=9E=AC=EA=B1=B4=EC=9D=98=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20->=20=EC=A0=95=EC=83=81=EC=A0=81=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9C=84=EC=9B=90=EC=9E=A5=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=9D=80=20=EC=82=AD=EC=A0=9C=EB=90=98=EC=96=B4=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=EB=90=98=EA=B3=A0=20=EC=9E=88=EC=8A=B5=EB=8B=88?= =?UTF-8?q?=EB=8B=A4.=20=09=09=09=EC=9D=B4=EC=A0=84=EC=97=90=20=EC=98=AC?= =?UTF-8?q?=EB=9D=BC=EC=98=A8=20=EA=B2=B0=EC=9E=AC=EA=B1=B4=EC=9D=98=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20->=20=EB=8C=80=EA=B2=B0=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=EC=9D=84=20=ED=86=B5=ED=95=B4=20=EA=B2=B0=EC=9E=AC=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=ED=98=B9=EC=9D=80=20=EC=9C=84=EC=9B=90=EC=9E=A5?= =?UTF-8?q?=EC=9D=B4=20=EA=B2=B0=EC=9E=AC=ED=95=B4=EC=95=BC=ED=95=A9?= =?UTF-8?q?=EB=8B=88=EB=8B=A4.=20=09=09=09=EC=9D=B4=EB=AF=B8=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EB=90=9C=20=EC=A0=95=EC=83=81=EC=A0=81=EC=9D=B8=20?= =?UTF-8?q?=EA=B2=B0=EC=9E=AC=20=ED=94=84=EB=A1=9C=EC=84=B8=EC=8A=A4(?= =?UTF-8?q?=EC=B2=98=EB=A6=AC)=EB=A5=BC=20=EC=88=98=ED=96=89=ED=95=B4?= =?UTF-8?q?=EC=95=BC=20=ED=95=98=EA=B8=B0=20=EB=95=8C=EB=AC=B8=EC=9E=85?= =?UTF-8?q?=EB=8B=88=EB=8B=A4.=20=09=092.=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A1=B0=EC=9E=91(DB=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD)=EC=9D=84=20=ED=86=B5=ED=95=B4=20=EC=9C=84=EC=9B=90?= =?UTF-8?q?=EC=9E=A5=20=EA=B2=B0=EC=9E=AC=EB=A5=BC=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=B0=A9=EB=B2=95=20=09=09=09=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=A1=B0=EC=9E=91=EC=9D=84=20=ED=86=B5?= =?UTF-8?q?=ED=95=B4=20=EC=9C=84=EC=9B=90=EC=9E=A5=EA=B2=B0=EC=9E=AC?= =?UTF-8?q?=EB=A5=BC=20=EC=88=98=EC=A0=95=ED=95=A0=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EB=88=84=EB=9D=BD=20?= =?UTF-8?q?=ED=98=B9=EC=9D=80=20=EA=BC=AC=EC=9D=BC=20=ED=99=95=EB=A5=A0?= =?UTF-8?q?=EC=9D=B4=20=EB=86=92=EC=95=84=20=EC=9C=84=ED=97=98=EC=84=B1?= =?UTF-8?q?=EC=9D=B4=20=EB=86=92=EB=8B=A4=EA=B3=A0=20=ED=8C=90=EB=8B=A8?= =?UTF-8?q?=EB=90=A9=EB=8B=88=EB=8B=A4.=20=09=09=09=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=ED=95=84=EC=9A=94=20=EC=8B=9C=20=EC=86=8C=EC=9A=94=20=EA=B8=B0?= =?UTF-8?q?=EA=B0=84=EC=9D=80=202=EC=A3=BC=EC=A0=95=EB=8F=84=EB=A1=9C=20?= =?UTF-8?q?=ED=8C=90=EB=8B=A8=EB=90=98=EA=B3=A0,=20=EC=A0=91=EC=88=98?= =?UTF-8?q?=EA=B2=B0=EC=9E=AC=20=EC=9A=94=EC=B2=AD=20=EC=8B=9C=20=EC=9C=84?= =?UTF-8?q?=EC=9B=90=EC=9E=A5=EC=9D=80=20=EA=B2=B0=EC=9E=AC=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EB=90=9C=20=EC=8B=9C=EC=A0=90=20=EB=B3=B4=EB=8B=A4=20=EC=9D=B4?= =?UTF-8?q?=EC=A0=84=EC=97=90=20=EC=8B=A0=EC=B2=AD=EB=90=9C=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=EC=82=AC=EA=B1=B4=EC=9D=98=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EA=B0=80=20=EA=BC=AC=EC=9D=BC=20=ED=99=95=EB=A5=A0?= =?UTF-8?q?=EC=9D=B4=20=EB=86=92=EC=8A=B5=EB=8B=88=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 4. 아래쪽의 반려와 결재 버튼은 순서를 바꿔주시기 부탁드립니다. (결재가 먼저 오고 반려가 두번째에.... 결재 버튼 누르는게 헷갈린다고 하세요) => 소스 수정 완료 --- .../webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 4 +++- .../jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp | 6 +++--- .../kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp | 6 +++--- .../web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp | 3 +-- .../accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp | 3 +-- .../jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp | 3 +-- src/main/webapp/innorix/innorix.js | 4 +++- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index b9dec0d7..d761733a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -367,7 +367,9 @@ $(document).ready(function(){ success: function (returnData, status) { if(returnData.result == 'FAIL'){ if(returnData.message != ''){ - alert(returnData.message); + if(returnData.message != undifined){ + alert(returnData.message); + } }else{ alert("처리중 오류가 발생하였습니다."); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 00fdc2d4..3bbded4c 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -1244,11 +1244,11 @@ - + - +
@@ -1309,8 +1309,8 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp index d66c9bf1..37ea7fdf 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageEndDetail.jsp @@ -1181,11 +1181,11 @@ function getPageUrl(idx) { - + - +
@@ -1243,8 +1243,8 @@ function getPageUrl(idx) { <%-- 최고관리자의 경우 결재, 반려 버튼 미노출 --%> - +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp index b64b5488..855c23d3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail.jsp @@ -368,8 +368,7 @@ resInfo--%>
-<%-- 웹접근성 인증 주석처리_이준호_230321 --%> -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp index 4728c555..3cc1b532 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/adjstReqStatusTabDetail_in_workflow.jsp @@ -267,8 +267,7 @@

-<%-- 웹접근성 인증 주석처리_이준호_230321 --%> -<%-- --%> + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp index c0e38be6..44af24b8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistInformation.jsp @@ -79,8 +79,7 @@ function tutorialPop(){

조정신청

- <%-- 웹접근성 인증 주석처리_이준호_230321 --%> - <%-- --%> +
diff --git a/src/main/webapp/innorix/innorix.js b/src/main/webapp/innorix/innorix.js index 032fa2da..f1555940 100644 --- a/src/main/webapp/innorix/innorix.js +++ b/src/main/webapp/innorix/innorix.js @@ -9,7 +9,9 @@ // 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-09-30) /*var INNORIX_LICENSE = "WEiCgfGkBpqQN/Zw0Ae0YQDFQoK5vit/hNZK/8gGNUm+mtjwAJr4dLSFCiLgiY9BOWSg925hgOfaW1olUgUTccrrl6Y=";*/ // 라이선스 유형 : INNORIX WP 91일 체험 (만료 2022-12-31) -/*var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0=";*/ +//var INNORIX_LICENSE = "SQeXVJiPNj/2u6W8BXoc1pX1l1D0Dc1azbDxUT+BQPLxsV86kF62+FUvIaofOXnArJTjp9kn/ZtUA+Ps0JFla2QGiu0="; +// 라이선스 유형 : INNORIX WP 30일 체험 (만료 2023-05-05) +//var INNORIX_LICENSE = "3v0AzGS0JgwSdFHLQQxxtUkUhisBNnaQemUNZDGw/tswnXPMQE446fqMs3uzb/EOWHvJhjRifBmG2cB2twGldoZzpkI="; // 운영라이선스 적용 var INNORIX_LICENSE = "FXA8KvVU99M9Ubbr3Yrz91zCNqyXdWCqUQ/OO1f7lj3nifVZZjuLqJIlHXjosrbPynCFJat5fwEgP/RVXftvXSsXmAHSnTVLYciyf8XmbxH8SLfUdCIEnFo+zL8="; From 0d8c0e116f34e89778a00b356285ba42ede856e7 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Thu, 11 May 2023 14:48:46 +0900 Subject: [PATCH 2/2] test --- .../egovframework/egovProps/globals_local.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index af3f5471..bdab081a 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -33,8 +33,8 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -#Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8 -Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 +Globals.Url=jdbc:CUBRID:119.193.215.98:30000:kcc_adr_advc_test:::?charset=utf8 +#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8