diff --git a/src/main/java/itn/com/cmm/util/MsgSendUtils.java b/src/main/java/itn/com/cmm/util/MsgSendUtils.java index 1f0150b3..d2cc92f0 100644 --- a/src/main/java/itn/com/cmm/util/MsgSendUtils.java +++ b/src/main/java/itn/com/cmm/util/MsgSendUtils.java @@ -244,7 +244,6 @@ public final class MsgSendUtils { boolean hasPerformedSpamCheck = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어 boolean hasPerformedMsgType = false; // 치환 문자가 없는 경우, 스팸 체크가 한 번만 수행되도록 제어 - boolean hasSetSubject = false; // 치환 데이터가 아닐 때 제목 설정 플래그 String msgKind = mjonMsgVO.getMsgKind(); String smsTxtTemp = mjonMsgVO.getSmsTxt(); @@ -331,7 +330,7 @@ public final class MsgSendUtils { sendVO.setMsgType(msgTypeResult); // 제목 셋팅 - if (LONG_MSG_TYPE.equals(msgTypeResult) && (replaceYN || !hasSetSubject)) { + if (LONG_MSG_TYPE.equals(msgTypeResult)){ String mmsTitleTemp = ""; // 제목이 비어 있고 전송할 SMS 텍스트가 존재하는 경우에만 처리 if (StringUtils.isEmpty(mmsSubject) && StringUtils.isNotEmpty(smsTxt)) { @@ -339,9 +338,6 @@ public final class MsgSendUtils { mmsTitleTemp = getMmsgSubject(smsTxt, msgKind); // 치환 데이터가 아닌 경우 제목 설정 완료 플래그를 true로 설정 - if (!replaceYN) { - hasSetSubject = true; // 제목 설정 완료 - } } // 설정된 제목을 현재 메시지 객체에 적용 diff --git a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java index b889d9cc..5db91c18 100644 --- a/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java +++ b/src/main/java/itn/let/mjo/mjocommon/MjonCommon.java @@ -522,7 +522,7 @@ private int parseIntOrDefault(String value, int defaultValue) { } // 사용자 정보 조회 및 기본값 처리 - private UserManageVO getUserManageInfo(String userId) throws Exception { + public UserManageVO getUserManageInfo(String userId) throws Exception { // UserManageVO userManageVO = new UserManageVO(); // userManageVO.setAdminSmsNoticeYn("Y"); // 기본값 // userManageVO.setSmishingYn("N"); // 기본값 diff --git a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java index fc4bf98d..cb6641f8 100644 --- a/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java @@ -3987,6 +3987,8 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M // log.debug(" :: smsTxt :: [{}]", smsTxt); StatusResponse statusResponse = new StatusResponse(); + + // 화면에서 저장한 이미지 가져오기 mjonMsgVO = setImagesSetting(mjonMsgVO, statusResponse); if (mjonMsgVO == null) { @@ -4040,6 +4042,11 @@ public class MjonMsgDataServiceImpl extends EgovAbstractServiceImpl implements M mjonMsgVO.setAgentCode(hotlineAgentCode); + + +// UserManageVO userManageVO = MjonCommon.getUserManageInfo(userId); + + // 스팸관련 키워드 select List resultSpamTxt = mjonMsgDataService.selectSpamKeywordList(); 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 55ab57ed..fc7adf8d 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 @@ -711,11 +711,11 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - + " title="Check " type="checkbox"/> - class="smishing"> + class="smishing"> @@ -723,14 +723,14 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - class="smishing"> + class="smishing"> - class="smishing"> + class="smishing"> ', 'N'); return false;" value="온" /> @@ -740,11 +740,11 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - + class="smishing" style="cursor:pointer;"style="cursor:pointer;"> - + class="smishing" style="line-height:30px;text-align:right;"> @@ -763,6 +763,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { + class="smishing"> @@ -803,6 +804,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { + class="smishing" title=""> @@ -816,7 +818,8 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { 즉시 - + + smishing"> @@ -862,6 +865,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { + class="smishing"> @@ -878,6 +882,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { + class="smishing">