From a759a9f3f2ab7b9f202d24fd429d7258c7ebd338 Mon Sep 17 00:00:00 2001
From: "hehihoho3@gmail.com" <hehihoho3@gmail.com>
Date: Fri, 20 Dec 2024 14:51:48 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EC=84=A0=20=EB=B0=B0=ED=8F=AC=20?=
 =?UTF-8?q?=EC=A4=80=EB=B9=84=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/let/mjo/msg/service/RefundDTO.java      | 4 +---
 src/main/java/itn/let/mjo/test/web/TestController.java    | 2 +-
 .../let/schdlr/service/impl/SchdlrManageServiceImpl.java  | 1 -
 src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp   | 5 +++--
 .../webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp  | 2 +-
 .../jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp     | 8 ++++----
 .../webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp   | 8 ++++----
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msg/service/RefundDTO.java b/src/main/java/itn/let/mjo/msg/service/RefundDTO.java
index 087b1e73..fa35e5e4 100644
--- a/src/main/java/itn/let/mjo/msg/service/RefundDTO.java
+++ b/src/main/java/itn/let/mjo/msg/service/RefundDTO.java
@@ -8,15 +8,13 @@ import lombok.Setter;
 public class RefundDTO {
 	private String userId;
 	private String msgGroupId;
-	private String userData;
 	private int msgSeq;
 	private String 	eachPrice ;	// 전송문자 개별가격
 
-	public RefundDTO(String userId, String msgGroupId, int msgSeq, String userData,  String eachPrice) {
+	public RefundDTO(String userId, String msgGroupId, int msgSeq, String eachPrice) {
 		this.userId = userId;
 		this.msgGroupId = msgGroupId;
 		this.msgSeq = msgSeq;
-		this.userData = userData;
 		this.eachPrice = eachPrice;
 	}
 }
diff --git a/src/main/java/itn/let/mjo/test/web/TestController.java b/src/main/java/itn/let/mjo/test/web/TestController.java
index 9234e5a4..8ea99214 100644
--- a/src/main/java/itn/let/mjo/test/web/TestController.java
+++ b/src/main/java/itn/let/mjo/test/web/TestController.java
@@ -3457,7 +3457,7 @@ public class TestController {
 			
 				// 필요한 필드만 DTO로 매핑
 				List<RefundDTO> dtoList = msgFailList.stream()
-	                .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getUserData(), msg.getEachPrice()))
+	                .map(msg -> new RefundDTO(msg.getUserId(), msg.getMsgGroupId(), Integer.parseInt(msg.getUserData()), msg.getEachPrice()))
 	                .collect(Collectors.toList());
 				// JSON 변환
 				ObjectMapper objectMapper = new ObjectMapper();
diff --git a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
index dd8024ba..12301fed 100644
--- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
+++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
@@ -521,7 +521,6 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements
 																	msg.getUserId()
 																	, msg.getMsgGroupId()
 																	, Integer.parseInt(msg.getUserData())
-																	, msg.getUserData()
 																	, msg.getEachPrice())
 														)
 														.collect(Collectors.toList());
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index 5c5a9a95..fc77da82 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -1354,8 +1354,9 @@ function actionLogin() {
         <div class="header_body">
             <div class="inner table">
                 <h1 class="logo"><a href="/web/main/mainPage.do" title="문자온 메인 바로가기">
-<!--                 <img src="/publish/images/CI.png" alt="단체문자 대량문자 발송 인터넷 웹문자 사이트 - 문자온"> -->
-                ADVANCED 문자온</a></h1>
+                <img src="/publish/images/CI.png" alt="단체문자 대량문자 발송 인터넷 웹문자 사이트 - 문자온">
+<!--                 ADVANCED 문자온 -->
+                </a></h1>
                 <ul class="gnbWrap table_cell">
                 	<c:forEach var="resultListOne" items="${menuResultList}" varStatus="status">
 		           		<c:if test="${resultListOne.depth eq '1' }">
diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp
index 5bfa3b10..d33da03d 100644
--- a/src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxSentPrintListPopUp.jsp
@@ -157,7 +157,7 @@ function f_print(){
 													<c:set var="totPrice" value="${totPrice + totfailPrice}"/>
 												</p>
 											</td>
-										</tr
+										</tr>
 									</tr>
 									</c:forEach>
 									<tr class="total_price">
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
index 2b00bae3..0ab5e87b 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/include/KaKaoAlimtalkTopMenuTap.jsp
@@ -142,10 +142,10 @@ function cntntBtnInfo(stepInfo){
 
 	<ul class="tabType4">
         <li id="tabAt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlim');">알림톡</button></li>
-        <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') 
-        || fn:contains(pageContext.request.requestURL , '119.193.215.98')}">
-	        <li id="tabFt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabFriend');">친구톡</button></li>
-        </c:if>
+<%--         <c:if test="${fn:contains(pageContext.request.requestURL , 'localhost')  --%>
+<%--         						|| fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> --%>
+<!-- 	        <li id="tabFt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabFriend');">친구톡</button></li> -->
+<%--         </c:if> --%>
         <li id="tabConf" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabConf');">카카오톡 설정</button></li>
         <li id="tabIntro" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlimtalkIntrd');">알림톡 소개</button></li>
     </ul>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
index b4292c66..d3c53069 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
@@ -946,10 +946,10 @@ function infoPop(pageUrl){
 					<ul class="list_tab">
 						<li class="tab active"><button type="button" onclick="fnTabLoad('',0); return false;">전체</button></li>
 						<li class="tab"><button type="button" onclick="fnTabLoad('at', 1); return false;">알림톡</button></li>
-						<c:if test="${fn:contains(pageContext.request.requestURL , 'localhost') 
-				        || fn:contains(pageContext.request.requestURL , '119.193.215.98')}">
-							<li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li>
-				        </c:if>
+<%-- 						<c:if test="${fn:contains(pageContext.request.requestURL , 'localhost')  --%>
+<%-- 				        || fn:contains(pageContext.request.requestURL , '119.193.215.98')}"> --%>
+<!-- 							<li class="tab"><button type="button" onclick="fnTabLoad('ft', 2); return false;">친구톡</button></li> -->
+<%-- 				        </c:if> --%>
 					</ul><!--// tab button -->
 				</div>
 				<!-- 예약관리 > 전체 -->