From 2e861d306a611719a5f4ac8ff8b878b4a5d97cec Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Wed, 10 Jul 2024 18:32:11 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=82=AC=EC=9A=A9=EC=9E=90]=20=EC=B9=B4?=
 =?UTF-8?q?=ED=86=A1=EB=B0=9C=EC=86=A1=20>=20=EC=95=8C=EB=A6=BC=ED=86=A1?=
 =?UTF-8?q?=20=EC=86=8C=EA=B0=9C=20=3D=3D>=EC=84=9C=EB=B9=84=EC=8A=A4=20?=
 =?UTF-8?q?=EC=9D=B4=EC=9A=A9=20=EB=B0=A9=EB=B2=95=20=EB=A7=81=ED=81=AC=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stepInfo/web/KakaoStepInfoController.java |  8 +++-
 .../kakao/include/KaKaoAlimtalkTopMenuTap.jsp | 48 +++++++++++++++++++
 .../web/kakao/intrd/KakaoAllimtalkIntro.jsp   |  6 ++-
 .../jsp/web/kakao/stepinfo/KakaoStepInfo.jsp  | 18 -------
 4 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
index 5b1fb768..e33d5ca1 100644
--- a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
+++ b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
@@ -176,7 +176,13 @@ public class KakaoStepInfoController {
 	public String kakaoAlimtalkIntrdView(HttpServletRequest request, 
 			@ModelAttribute("searchVO") BoardMasterVO boardMasterVO, ModelMap model , BoardVO boardVO ,
 			RedirectAttributes redirectAttributes) throws Exception {
-		
+
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+		if(userId == "") {
+			return "redirect:/web/user/login/login.do";
+		}
+		model.addAttribute("loginVO", loginVO);
 		
 		return "/web/kakao/intrd/KakaoAllimtalkIntro";
 	}
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 55927ac7..bdd687f5 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
@@ -68,6 +68,8 @@ function usrDeptChk(){
 	
 	var usrDept = '${loginVO.dept}';
 	
+	console.log('usrDept : ', usrDept);
+	
 	//카카오 알림톡 기업회원 전용체크
 	if(usrDept != 'c'){
 		
@@ -82,7 +84,53 @@ function usrDeptChk(){
 	
 }
 
+ /**
+ * @discripton : 카톡발송 > 알림톡 소개 하단에 버튼 액션
+ * 				기업회원 체크
+ */
+function cntntBtnInfo(stepInfo){
+	
+
+	//기업회원 여부 체크
+	if(usrDeptChk()){
+		if(stepInfo == 'step02'){
+			location.href="<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>";
+		}else if(stepInfo == 'step03'){
+			location.href="<c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>";
+			
+		}
+	}	
+}
+
+//step 02
+//<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>
+
+
+// step 03
+// <c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>
+
 </script>
+
+
+<!-- 기업회원 이동 팝업 -->
+<div class="tooltip-wrap cvt_member_popup_wrap">
+    <div class="popup-com cvt_member_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close">
+       <div class="popup_heading">
+           <p>알림</p>
+           <button type="button" class="tooltip-close" data-focus="popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
+       </div>
+       <div class="layer_in">
+           <p>카카오톡 알림톡은 기업회원만 전송 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
+           <div class="popup_btn_wrap2">
+           	<button type="button" onclick="location.href='/web/user/membershipChange.do'">확인</button>
+               	<button type="button" class="tooltip-close" data-focus="popup02-close" data-focus-next="popup02">취소</button>
+            </div>
+        </div>
+    </div>
+</div>
+<button type="button" id="btnDeptPop" data-tooltip="popup02" style="display: none;"></button>
+
+
 	<ul class="tabType4">
         <li id="tabAt" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabAlim');">알림톡</button></li>
         <li id="tabConf" class="tab topTab"><button type="button" onclick="javascript:fnLinkPageTopTab('tabConf');">카카오톡 설정</button></li>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp
index 56a05337..b9f29b6e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/intrd/KakaoAllimtalkIntro.jsp
@@ -203,7 +203,8 @@
 						</div>
 						<div class="text">
 							<div class="btn">
-								<a href="<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>">채널 ID 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
+<%-- 								<a href="<c:url value='/web/mjon/kakao/profile/selectKaKaoProfileList.do'/>">채널 ID 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a> --%>
+								<a href="javascript:cntntBtnInfo('step02');">채널 ID 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
 							</div>
 							<div class="text-line"></div>
 							<div class="type">
@@ -225,7 +226,8 @@
 						</div>
 						<div class="text">
 							<div class="btn">
-								<a href="<c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>">알림톡 템플릿 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
+<%-- 								<a href="<c:url value='/web/mjon/kakao/template/selectKaKaoTemplateList.do'/>">알림톡 템플릿 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a> --%>
+								<a href="javascript:cntntBtnInfo('step03');">알림톡 템플릿 등록하러 가기<img src="/publish/images/kakao_intro_cont/arrow.jpg" alt="화살표"></a>
 							</div>
 							<div class="text-line"></div>
 							<div class="type">
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp
index d658b5d7..7e8c17f7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/stepinfo/KakaoStepInfo.jsp
@@ -54,24 +54,6 @@ function fnGoFriends(){
 	<input type="hidden" id="menuSubTab" name="menuSubTab" value="tabStep">
 </form>
 
-<!-- 기업회원 이동 팝업 -->
-<div class="tooltip-wrap cvt_member_popup_wrap">
-    <div class="popup-com cvt_member_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close">
-       <div class="popup_heading">
-           <p>알림</p>
-           <button type="button" class="tooltip-close" data-focus="popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
-       </div>
-       <div class="layer_in">
-           <p>카카오톡 알림톡은 기업회원만 전송 가능합니다.<br>기업회원 전환 페이지로 이동하시겠습니까?</p>
-           <div class="popup_btn_wrap2">
-           	<button type="button" onclick="location.href='/web/user/membershipChange.do'">확인</button>
-               	<button type="button" class="tooltip-close" data-focus="popup02-close" data-focus-next="popup02">취소</button>
-            </div>
-        </div>
-    </div>
-</div>
-<button type="button" id="btnDeptPop" data-tooltip="popup02" style="display: none;"></button>
-
 <!-- content 영역 -->
 <div class="inner">
     <!-- send top -->