From 26d0775a616b5de0e1167e28d8f8ebb0e3bb2ead Mon Sep 17 00:00:00 2001 From: rosewiper Date: Thu, 14 Dec 2023 17:43:29 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90=2020?= =?UTF-8?q?=EA=B1=B4=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=2020=EA=B1=B4=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=90=EB=8A=94=20=EC=84=A0=EA=B1=B0?= =?UTF-8?q?=ED=95=84=EC=88=98=EB=AC=B8=EA=B5=AC=EA=B0=80=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=EC=98=A4=EB=A5=98=20=EB=B0=9C?= =?UTF-8?q?=EC=83=9D=ED=95=98=EC=97=AC=20=EC=88=98=EC=A0=95=ED=95=A8=20?= =?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90=20=EB=B0=9B=EB=8A=94?= =?UTF-8?q?=EC=82=AC=EB=9E=8C=20=EC=98=81=EC=97=AD=EC=9D=98=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=EB=A1=9D=EC=97=90=EB=93=B1=EB=A1=9D=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84,=20=EC=B9=98=ED=99=98=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EC=97=90=20","=20=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20=EC=A0=80=EC=9E=A5=EC=97=90=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EB=B0=9C=EC=83=9D=ED=95=98=EC=97=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=B2=98=EB=A6=AC=ED=95=A8=20=20-=20","?= =?UTF-8?q?=EB=A5=BC=20=EB=8B=A4=EB=A5=B8=20=EB=AC=B8=EC=9E=90=EB=A1=9C=20?= =?UTF-8?q?=EC=B9=98=ED=99=98=ED=95=98=EC=97=AC=20=EC=BB=A8=ED=8A=B8?= =?UTF-8?q?=EB=A1=A4=EB=9F=AC=EB=A1=9C=20=EC=A0=84=EB=8B=AC=20=ED=9B=84=20?= =?UTF-8?q?=EC=97=AD=EC=B9=98=ED=99=98=ED=95=98=EC=97=AC=20=EB=94=94?= =?UTF-8?q?=EB=B9=84=EC=97=90=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp | 10 +++++----- src/main/webapp/WEB-INF/jsp/web/pop/testSendPop.jsp | 13 ++++++++++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp index 68b31566..a2db4aa0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp @@ -2177,31 +2177,31 @@ $('.registAddr').click(function(){ } - nameList[i] = name; + nameList[i] = name.replaceAll(",","§"); phoneNum[i] = phone; if(rep1 == "" || rep1 == null){ rep1List[i] = "-"; }else{ - rep1List[i] = rep1; + rep1List[i] = rep1.replaceAll(",","§"); } if(rep2 == "" || rep2 == null){ rep2List[i] = "-"; }else{ - rep2List[i] = rep2; + rep2List[i] = rep2.replaceAll(",","§"); } if(rep3 == "" || rep3 == null){ rep3List[i] = "-"; }else{ - rep3List[i] = rep3; + rep3List[i] = rep3.replaceAll(",","§"); } if(rep4 == "" || rep4 == null){ rep4List[i] = "-"; }else{ - rep4List[i] = rep4; + rep4List[i] = rep4.replaceAll(",","§"); } /* if(name == "" || name == null){ diff --git a/src/main/webapp/WEB-INF/jsp/web/pop/testSendPop.jsp b/src/main/webapp/WEB-INF/jsp/web/pop/testSendPop.jsp index 81ae99cc..f01f426e 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pop/testSendPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pop/testSendPop.jsp @@ -123,9 +123,16 @@ function fn_testSendMsgData(){ form.smsTxt.value = adTxt + $(".preview_auto").find("pre").text() + '\n' + denyTxt + " "; //광고 문구 뒤에 공백을 붙이게되므로, 뒤에 한칸 추가하여 바이트수를 맞춤 } else if (msgKind == 'C') { //선거문자 - var adTxt = $('.ad_tit').text(); - var denyTxt = $('.deny_receipt').html(); - denyTxt = denyTxt.replaceAll("
","\n"); + var adTxt = ''; + var denyTxt = ''; + var adverYn = opener.document.msgForm.send_adYn.value; + + //선거문자 20건 발송에서는 선거 필수문구가 필수가 아니어서 선거문자 필수 문구가 있는지 체크하여 처리함.20231214 추가 + if(adverYn == 'Y'){ + adTxt = $('.ad_tit').text(); + denyTxt = $('.deny_receipt').html(); + denyTxt = denyTxt.replaceAll("
","\n"); + } form.smsTxt.value = adTxt + '\n' + $(".preview_auto").find("pre").text() + '\n' + denyTxt;