타이틀 테스트 커밋
This commit is contained in:
hehihoho3@gmail.com
parent
0a21e4be6e
commit
8f1f8b78a1
@ -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; // 제목 설정 완료
|
||||
}
|
||||
}
|
||||
|
||||
// 설정된 제목을 현재 메시지 객체에 적용
|
||||
|
||||
@ -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"); // 기본값
|
||||
|
||||
@ -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<String> resultSpamTxt = mjonMsgDataService.selectSpamKeywordList();
|
||||
|
||||
|
||||
@ -711,11 +711,11 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
<tbody>
|
||||
<c:forEach var="result" items="${resultList}" varStatus="status">
|
||||
<tr>
|
||||
<td>
|
||||
<td><!-- 번호 -->
|
||||
<input name="checkField" id="<c:out value="${result.userId}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/><label for="<c:out value="${result.userId}"/>"></label>
|
||||
<input name="checkId" type="hidden" class="${result.userId}" value="<c:out value='${result.userId}'/>:<c:out value='${result.userId}'/>"/>
|
||||
</td>
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>><!-- 아이디 -->
|
||||
<c:if test="${searchVO.searchSortOrd eq 'desc' }">
|
||||
<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
|
||||
</c:if>
|
||||
@ -723,14 +723,14 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>
|
||||
</c:if>
|
||||
</td>
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>><!-- 법인폰 -->
|
||||
<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
|
||||
<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
|
||||
<c:out value="${result.userId}"/>(<c:out value="${result.userNm}"/>)
|
||||
</a>
|
||||
</div>
|
||||
</td>
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>>
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if><c:if test="${result.smishingYn eq 'N'}"></c:if>><!-- 발신번호 -->
|
||||
<c:choose>
|
||||
<c:when test="${result.adminSmsNoticeYn eq 'Y'}">
|
||||
<input type="button" style="margin-left:3px;margin-right:0;vertical-align:top;color:#ffffff !important;" class="btnType1" onclick="setSmsNoticeUpdate('<c:out value="${result.userId}"/>', 'N'); return false;" value="온" />
|
||||
@ -740,11 +740,11 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
|
||||
<!-- 발송건수 -->
|
||||
<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing" style="cursor:pointer;"</c:if><c:if test="${result.smishingYn eq 'N'}">style="cursor:pointer;"</c:if>>
|
||||
<c:out value="${result.callFrom}"/>
|
||||
</td>
|
||||
|
||||
<!-- 스미싱의심 -->
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> style="line-height:30px;text-align:right;">
|
||||
<c:choose>
|
||||
<c:when test="${result.successCount > 0}">
|
||||
@ -763,6 +763,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<!-- 요청시간 -->
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
||||
<c:choose>
|
||||
<c:when test="${result.delayYn eq 'Y'}">
|
||||
@ -803,6 +804,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<!-- 예약 -->
|
||||
<td onclick="fn_detail_list('${result.msgGroupId}'); return false;" <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if> title="<c:out value="${result.reqDate}"/>">
|
||||
<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||
<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
|
||||
@ -816,7 +818,8 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
즉시
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
</td>
|
||||
<!-- 내용 -->
|
||||
<td class="sms_detail left <c:if test="${result.smishingYn eq 'Y'}">smishing</c:if>">
|
||||
<c:choose>
|
||||
<c:when test="${empty result.smsTxt}">
|
||||
@ -862,6 +865,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<!-- 타입 -->
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
||||
<c:choose>
|
||||
<c:when test="${result.msgTypeTxt eq 'SMS전송'}">
|
||||
@ -878,6 +882,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</td>
|
||||
<!-- 방식 -->
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
||||
<c:choose>
|
||||
<c:when test="${result.sendKind eq 'A'}">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user