diff --git a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java index 9da25cfc..bf32ee59 100644 --- a/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java @@ -4739,14 +4739,18 @@ public class EgovBBSManageController { // 불법스팸방지안내 if (termsVO.getMenuNm().equals("04")) { - termsVO.setSearchSortCnd("TERMS_ID"); - termsVO.setSearchSortOrd("ASC"); - resultList = egovSiteManagerService.selectTermsMenu(termsVO); + + if("2023".equals(termsMstNo)) { + termsVO.setSearchSortCnd("TERMS_ID"); + termsVO.setSearchSortOrd("ASC"); + resultList = egovSiteManagerService.selectTermsMenu(termsVO); + model.addAttribute("resultList", resultList); + } + + String jspName = "TermsListSpam_" + termsMstNo + "_Ajax"; + return "web/cop/bbs/"+jspName; + } - - model.addAttribute("resultList", resultList); - - return "web/cop/bbs/TermsListAjax"; } // else { // String effectDate_02 = ""; diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 8fea870c..125c9c17 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1937,7 +1937,8 @@ public class EgovLoginController { if("01".equals(cmpChangeManageVO.getHstSttus()) || "03".equals(cmpChangeManageVO.getHstSttus()) ) { //가장 마지막 기업회원 가입이 신청 또는 반려 상태일 시 String message = "기업회원 신청 또는 반려상태입니다."; - + modelAndView.addObject("returnType", "B"); + modelAndView.addObject("mberId", loginVO.getId()); modelAndView.addObject("status", "fail"); modelAndView.addObject("msg", message); return modelAndView; @@ -2051,7 +2052,7 @@ public class EgovLoginController { if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { String message = "휴면계정입니다."; - modelAndView.addObject("dormantYn", "Y"); + modelAndView.addObject("returnType", "A"); modelAndView.addObject("status", "fail"); modelAndView.addObject("msg", message); return modelAndView; 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 9ec84925..0a766c42 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonFooter.jsp @@ -29,7 +29,7 @@ function footerSiteLinkPageTwoGo (){
  • 회사소개
  • 이용약관
  • 개인정보처리방침
  • -
  • 불법스팸방지정책
  • +
  • 불법스팸방지정책
  • @@ -39,7 +39,7 @@ function footerSiteLinkPageTwoGo (){ + 대량문자 전송자격인증 마크 diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsList.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsList.jsp index 9f1c19f8..02c67428 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsList.jsp @@ -57,6 +57,8 @@ function setBbsId(bbsId,itm){ mastNo = $("#termsMastNo02").val(); }else if(bbsId == "03"){ mastNo = $("#termsMastNo03").val(); + }else if(bbsId == "04"){ + mastNo = $("#termsMastNo03").val(); } document.searchForm.termsMastNo.value = mastNo; @@ -110,7 +112,7 @@ function getTermsOtherVersion(){ diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsListAjax.jsp index ef495a13..fab9765e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/bbs/TermsListAjax.jsp @@ -58,7 +58,7 @@ $(document).ready(function () {
    - KISA 불법 스팸방지를 위한 정보통신망법 안내서 + KISA 불법 스팸방지를 위한 정보통신망법 안내서
    diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp index b9f29b6e..2934827b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp @@ -287,7 +287,7 @@
  • - 알림톡에서 허용하는 영리목적이 없는 정보성 메시지에 해당하는지 여부는 스팸 관련 정보통신망법 안내서를 꼭 참고하시길 바랍니다.
  • (주문/예약 확인, 결제 내역, 배송 현황 메시지 등이 이에 해당하며 구독자 대상의 뉴스레터나 일반적인 공지문은 포함되지 않습니다.)
  • - 스팸 관련 정보통신망법 안내서 바로가기 + 스팸 관련 정보통신망법 안내서 바로가기
  • - 부고, 답례, 초대장 등은 정보성 메시지가 아니므로 알림톡으로 보내실 수 없습니다.
  • diff --git a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp index bd80f6fb..839a1357 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/EgovLoginGnrlUsr.jsp @@ -212,9 +212,13 @@ function actionLogin(){ }else if (data.status=="fail"){ - if (data.dormantYn=="Y"){ + if (data.returnType == "A"){ document.loginForm2.action=""; document.loginForm2.submit(); + }else if (data.returnType == "B"){ + document.cmpChangeForm.mberId.value = data.mberId; + document.cmpChangeForm.action=""; + document.cmpChangeForm.submit(); }else{ $("#ret_msg").show(); $("#ret_msg_info").html(''+data.msg); @@ -673,4 +677,7 @@ function fn_click_banner_add_stat(bannerMenuCode){ +
    + +
    \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 59c4fea2..49ad29b5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -38,18 +38,31 @@ $(document).ready(function() { } + // 2단팝업 제거 + var agreePrivateSDate = "2024-11-29"; + var agreePrivateNow = new Date(); + agreePrivateNow = leadingZeros(agreePrivateNow.getFullYear(), 4) + '-' + leadingZeros(agreePrivateNow.getMonth() + 1, 2) + '-' + leadingZeros(agreePrivateNow.getDate(), 2); + if (agreePrivateNow < agreePrivateSDate) { + $("#agreePrivatePop_20241129").show(); + }else{ + $("#agreePrivatePop_20241129").hide(); + } + + //개인정보처리방침 팝업 날짜 설정 var agreePrivateSDate = "2024-11-23"; var agreePrivateNow = new Date(); agreePrivateNow = leadingZeros(agreePrivateNow.getFullYear(), 4) + '-' + leadingZeros(agreePrivateNow.getMonth() + 1, 2) + '-' + leadingZeros(agreePrivateNow.getDate(), 2); if (agreePrivateNow < agreePrivateSDate) { - $("#agreePrivatePop_20241119").show(); - $("#agreePrivatePop_20241106").hide(); + $("#agreePrivatePop_20241121").show(); + $("#agreePrivatePop_20241122").hide(); }else{ - $("#agreePrivatePop_20241119").hide(); - $("#agreePrivatePop_20241106").show(); + $("#agreePrivatePop_20241121").hide(); + $("#agreePrivatePop_20241122").show(); } + + //메인 팝업 호출 여부 var evntPopCk = fnGetCookie('layer_evntPayPop'); var pointPopCk = fnGetCookie('layer_pointPop'); @@ -1225,7 +1238,7 @@ function fn_click_banner_add_stat(bannerMenuCode){ -
    +