From 4d96b51b3791212b2c4af4ae35a9bcf784feaa5c Mon Sep 17 00:00:00 2001 From: wyh Date: Wed, 7 Aug 2024 15:05:38 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=B2=88=ED=98=B8=EB=8F=84=EC=9A=A9=20?= =?UTF-8?q?=EC=95=88=EB=82=B4=EB=AC=B8=EC=9E=90=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp | 9 +++++---- .../WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp | 9 +++++---- src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp index 2c284856..a0b1316a 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp @@ -822,10 +822,11 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp index 1b181f77..74b8b68b 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp @@ -687,10 +687,11 @@ function fnSmishingUpdate(flag) { diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index 086eeeba..7721272e 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -933,10 +933,11 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { From e222fdf78886c47dbe113548672624e5ac46ba73 Mon Sep 17 00:00:00 2001 From: wyh Date: Wed, 7 Aug 2024 15:06:36 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=ED=95=84=ED=84=B0=20=EB=B3=80=EC=88=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java b/src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java index 7ea774e1..2bd3ad86 100644 --- a/src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java +++ b/src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java @@ -60,6 +60,8 @@ public class InterceptorHandler extends HandlerInterceptorAdapter{ && !name.toLowerCase().contains("recommendid") && !name.toLowerCase().contains("mbernm") && !name.toLowerCase().contains("varvallist") + && !name.toLowerCase().contains("templatecontent") + && !name.toLowerCase().contains("buttonvolist") ) { //파라미터 중에 URL 주소를 넘겨주는 부분이 있어서 해당 부분에것 select~, update~, delete~ 로 시작하는 주소경로가 있어서 제외처리를 하였음 String[] values = request.getParameterValues(name); From a48c4b22dc9f5aefb3428235e71d651e3d068276 Mon Sep 17 00:00:00 2001 From: wyh Date: Wed, 7 Aug 2024 15:54:15 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EA=B8=B0=ED=83=80=EB=B3=80=EC=88=98=20100?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A6=9D=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/js/kakao/at/alimtalkExcel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/js/kakao/at/alimtalkExcel.js b/src/main/webapp/js/kakao/at/alimtalkExcel.js index 296e6b1d..23cd2d77 100644 --- a/src/main/webapp/js/kakao/at/alimtalkExcel.js +++ b/src/main/webapp/js/kakao/at/alimtalkExcel.js @@ -308,8 +308,8 @@ function displayJsonToHtmlTable02(jsonData){ else { // 기타변수는 50자리 까지 입력 - if(bodyData.length > 50){ - alert("등록 변수["+bodyData+"] \n기타 변수에는 50자리 까지 입력이 가능합니다."); + if(bodyData.length > 100){ + alert("등록 변수["+bodyData+"] \n기타 변수에는 100자리 까지 입력이 가능합니다."); lengthCheck = false; break; } From 30914b0d692eb37846dcaf89227e2751aad55703 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 9 Aug 2024 16:52:40 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20=ED=95=B8?= =?UTF-8?q?=EB=93=9C=ED=8F=B0=20=EB=B2=A8=EB=A5=98=EC=B2=B4=ED=81=AC=20/?= =?UTF-8?q?=20=EB=A1=9C=EB=94=A9=20active=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uss/umt/web/EgovUserManageController.java | 9 +++++-- .../webapp/WEB-INF/jsp/web/addr/AddrList.jsp | 25 ++++++------------- .../jsp/web/addr/include/addrListforExcel.jsp | 2 +- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index 1bdad3e8..38168d6d 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -1923,11 +1923,14 @@ public class EgovUserManageController { model.addAttribute("msgMmsGroupFWCntSum", msgMmsGroupFWCntSum); model.addAttribute("totMmsFWPriceSum", totMmsFWPriceSum); */ - + + System.out.println("==========================================================="); + System.out.println("==========================================================="); List sendSttstList = new ArrayList(); searchVO.setSendKind(""); MjonMsgVO allSttstInfo = mjonMsgService.selectApiSttstList(searchVO); + System.out.println("allSttstInfo.toString() : " + allSttstInfo.toString()); allSttstInfo.setSendKind(""); searchVO.setSendKind("H"); @@ -1942,7 +1945,9 @@ public class EgovUserManageController { sendSttstList.add(hompageSttstInfo); sendSttstList.add(apiSttstInfo); model.addAttribute("sendSttstList", sendSttstList); - + System.out.println("==========================================================="); + System.out.println("==========================================================="); + System.out.println("==========================================================="); //searchVO 데이터 원복 시키기 searchVO.setMsgType(msgType); searchVO.setFileCnt(fileCnt); diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp index 179d9999..91ad3af4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp @@ -282,24 +282,15 @@ function SetAddrMassSave(){ // tableExcel 그룹의 select 요소들을 확인 // var isPhoneSelected = false; // var isNameSelected = false; - $('.adr_hd.select_adr_hd[data-group="'+tabulNm+'"] .field-selector').each(function() { - var value = $(this).val(); - if (value === 'addrPhoneNo') { -// isPhoneSelected = true; - alert('휴대폰이 선택되지 않았습니다.'); - return false; + var columns = $objTabul.getColumns(); + var isAddrPhoneNoSelected = columns.some(column => column.getField() === 'addrPhoneNo'); - } -// else if (value === 'addrNm') { -// isNameSelected = true; -// } - - // 두 조건이 모두 충족되면 반복문 종료 -// if (isPhoneSelected && isNameSelected) { -// return false; -// } - }); - + if (!isAddrPhoneNoSelected) { +// isPhoneSelected = true; + alert('휴대폰이 선택되지 않았습니다.'); + return false; + + } // if (!isPhoneSelected || !isNameSelected) { // alert('휴대폰 또는 이름이 선택되지 않았습니다.'); // return false; diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp index 04b04c3f..4c91adc9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp @@ -391,7 +391,7 @@ function excelFileChange(file) { } // 로딩창 hide - fn_loadRemoveActive(); + } // 엑셀 데이터 처리 함수