From 30914b0d692eb37846dcaf89227e2751aad55703 Mon Sep 17 00:00:00 2001 From: hylee Date: Fri, 9 Aug 2024 16:52:40 +0900 Subject: [PATCH] =?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(); + } // 엑셀 데이터 처리 함수