From a62a9f115dc57156dfd2bd75130b6329e75cccb7 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Thu, 4 Jan 2024 09:49:33 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=B9=9C?=
 =?UTF-8?q?=EA=B5=AC=ED=86=A1=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=B9=9C=EA=B5=AC=ED=86=A1=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=ED=99=94=EB=A9=B4=20=EA=B8=B0?=
 =?UTF-8?q?=EC=97=85=ED=9A=8C=EC=9B=90=20=EC=B2=B4=ED=81=AC=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20=EC=BB=A8=ED=8A=B8?=
 =?UTF-8?q?=EB=A1=A4=EB=9F=AC=EC=97=90=EC=84=9C=20loginVO=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=AF=B8=EC=A0=84=EB=8B=AC=EB=A1=9C=20=EC=9D=B8?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=98=A4=EB=A5=98=20=EB=B0=9C=EC=83=9D?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KakaoFriendsTalkTemplateController.java   | 24 +++++++++++++++----
 .../ft/KakaoFriendstalkTemplateListAjax.jsp   |  8 +++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java
index 8e71bf06..644c789f 100644
--- a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java
+++ b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkTemplateController.java
@@ -34,6 +34,7 @@ import itn.let.kakao.kakaoComm.kakaoApi.service.KakaoApiService;
 import itn.let.kakao.user.kakaoFt.service.KakaoFriendsTalkTemplateService;
 import itn.let.mjo.symbol.service.MjonSymbolService;
 import itn.let.mjo.symbol.service.MjonSymbolVO;
+import itn.let.uss.umt.service.EgovUserManageService;
 
 @Controller
 public class KakaoFriendsTalkTemplateController {
@@ -54,6 +55,10 @@ public class KakaoFriendsTalkTemplateController {
 	@Resource(name = "mjonSymbolService")
 	private MjonSymbolService mjonSymbolService;
 	
+	/** userManageService */
+	@Resource(name = "userManageService")
+	private EgovUserManageService userManageService;
+	
 	@Autowired
 	KakaoApiProfile kakaoApiProfile;
 	
@@ -276,10 +281,10 @@ public class KakaoFriendsTalkTemplateController {
 	
 	
 	/** 
-	 * @methodName	: deleteKakaoFriendsImageDataAjax 
+	 * @methodName	: selectKakaoFriendsTemplateList 
 	 * @author		: 우영두
 	 * @date		: 2023.03.23 
-	 * @description	: deleteKakaoFriendsImageDataAjax 카카오 친구톡 이미지 삭제요청
+	 * @description	: selectKakaoFriendsTemplateList 카카오 친구톡 템플릿 리스트 화면
 	 * @param kakaoVO
 	 * @param model
 	 * @param response
@@ -297,8 +302,19 @@ public class KakaoFriendsTalkTemplateController {
 			return "redirect:/web/user/login/login.do";
 		}
 		
+		model.addAttribute("loginVO", loginVO);
+		
 		try {
 			
+			/**
+			 * 회원 정지된 상태이면 알림톡  템플릿 등록 화면으로 이동되지 않도록 처리
+			 * */
+			boolean mberSttus = userManageService.selectUserStatusInfo(userId);
+			
+			if(!mberSttus) {
+				return "redirect:/web/uat/uia/actionLogout.do";
+			}
+			
 			//사용자 등록 발신프로필 정보 조회해오기
 			searchVO.setUserId(userId);
 			List<KakaoVO> resultProfileList = kakaoApiService.selectKakaoProfileList(searchVO);
@@ -319,10 +335,10 @@ public class KakaoFriendsTalkTemplateController {
 	
 	
 	/** 
-	 * @methodName	: deleteKakaoFriendsImageDataAjax 
+	 * @methodName	: selectKakaoFriendsTemplateListAjax 
 	 * @author		: 우영두
 	 * @date		: 2023.03.23 
-	 * @description	: deleteKakaoFriendsImageDataAjax 카카오 친구톡 이미지 삭제요청
+	 * @description	: selectKakaoFriendsTemplateListAjax 카카오 친구톡 템플릿 하단 리스트 정보 조회
 	 * @param kakaoVO
 	 * @param model
 	 * @param response
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp
index c0315c2f..640b2077 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateListAjax.jsp
@@ -102,6 +102,14 @@ $(function(){
 			                           	</p>
 			                        </div>
 			                        <div class="allimtalk_content" onclick="javascript:fnTemplateDetail('<c:out value="${templatInfoList.friendId}"/>'); return false;" style="cursor:pointer;">
+			                        	
+			                        	<!-- 템플릿에 이미지가 있는경우 이미지 표시 -->
+			                        	<c:if test="${not empty templatInfoList.imageType}">
+			                        		<div class="img_box">
+				                                <img src="<c:url value='${templatInfoList.templateImageUrl}'/>" alt="">
+				                            </div>
+			                        	</c:if>
+			                        
 			                            <p class="template_text"><c:out value="${fn:replace(fn:replace(templatInfoList.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/></p>
 			                            <!-- 채널 추가형을 선택한 경우 자동으로 버튼이 하나 추가됨, 버튼을 추가한 경우 버튼 정보 표시 -->
 			                            <c:forEach var="templatInfoButtonList" items="${templatInfoList.buttonVOList}" varStatus="status">