From 2e6c6fe0df83c5f73d92f27fba5176118fe161c5 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Tue, 6 Feb 2024 09:46:24 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EC=9A=94=EA=B8=88=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD?= =?UTF-8?q?=EC=84=9C=20=EB=B0=8F=20=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8?= =?UTF-8?q?=EC=84=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EA=B1=B4=EC=88=98=EA=B0=80=20=EB=A7=8E?= =?UTF-8?q?=EC=9D=80=20=EA=B2=BD=EC=9A=B0=20msg=5Fgroup=5Fcnt=20=ED=95=A9?= =?UTF-8?q?=EC=82=B0=EC=97=90=EC=84=9C=20Integer=20=EB=B2=94=EC=9C=84?= =?UTF-8?q?=EB=A5=BC=20=EC=B4=88=EA=B3=BC=ED=95=98=EB=8A=94=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=EC=9D=B4=20=EB=B0=9C=EC=83=9D=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=EC=BB=AC=EB=9F=BC=ED=95=A9=EC=82=B0=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC=20(=ED=95=B4=EB=8B=B9=20?= =?UTF-8?q?=EA=B0=92=EC=9D=80=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 70454d4f..6b907c0f 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3494,7 +3494,7 @@ + +
날짜 : diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp index c20a7b5a..7adf742c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp @@ -959,6 +959,15 @@ function fn_sendMsgData(){ } + var chkCalltoCnt = $("input[name=chkCallTo]").length; + + if(Number(chkCalltoCnt) == 0){ + + alert("받는사람을 추가해 주세요."); + return false; + } + + //수신번호 리스트 체크하기 var numCnt = 0; var nameList = []; //치환문자 이름 @@ -1035,8 +1044,17 @@ function fn_sendMsgData(){ } - if(confirm("문자를 전송하시겠습니까?")){ + //엔터키로 문자 전송 바로 처리하기 : 엔터키와 엔터키 체크박스 둘다 조건 만족시 메시지 없이 전송처리 + var enterChk = $("#enterChk").is(':checked'); + if(!enterChk || !enterSts){ + if(!confirm("문자를 전송하시겠습니까?")){ + return false; + } + + } + + //if(confirm("문자를 전송하시겠습니까?")){ imgFilePath = []; $('.thumb_wrap').find('.thumb_img').each(function(idx, el) { @@ -1549,7 +1567,7 @@ function fn_sendMsgData(){ } - } + //} } diff --git a/src/main/webapp/publish/js/publish.js b/src/main/webapp/publish/js/publish.js index 6518c891..651cc796 100644 --- a/src/main/webapp/publish/js/publish.js +++ b/src/main/webapp/publish/js/publish.js @@ -53,7 +53,7 @@ var publishCommon = { if (chkCnt == 0) { - alert("받는사람을 추가해 주세요."); + //alert("받는사람을 추가해 주세요."); return false; }