From db1ebefc1eafd4b3f703550f045f4082a9b01789 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Fri, 5 Jan 2024 12:47:59 +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=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=95=EB=A0=AC=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/kakao/Kakao_FT_SQL_Mysql.xml      | 120 ++++++++----------
 .../ft/KakaoFriendstalkTemplateDetail.jsp     |   8 ++
 .../ft/KakaoFriendstalkTemplateListAjax.jsp   |   2 +-
 .../ft/KakaoFriendstalkTemplateRegist.jsp     |   7 +
 4 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml
index 3b780ebc..f50fe008 100644
--- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_FT_SQL_Mysql.xml
@@ -96,74 +96,58 @@
 	
 	<select id="kakaoFriendsTalkTemplateDAO.selectKakaoFriendsTemplateList" parameterClass="kakaoVO" resultClass="kakaoVO">
 	
-		SELECT COUNT(A.FRIEND_ID) OVER() AS totCnt ,
-			   A.FRIEND_ID AS friendId,
-		       A.USER_ID AS userId,
-		       A.SENDER_KEY AS senderKey,
-		       KPI.YELLOW_ID AS yellowId,
-		       A.TEMPLATE_NAME AS templateName,
-		       A.IMAGE_FILE_NAME AS imageFileName,
-		       A.IMAGE_URL AS templateImageUrl,
-		       A.IMAGE_TYPE AS imageType,
-		       A.IMAGE_TITLE AS imgTitle,
-		       A.IMAGE_LINK AS imgLink,
-		       A.TEMPLATE_CONTENTS AS templateContent,
-		       A.AD_FLAG AS adFlag,
-		       DATE_FORMAT(A.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
-		       A.FRST_REGISTER_ID AS frstRegisterId,
-		       DATE_FORMAT(A.LAST_UPDT_PNTTM, '%Y-%m-%d %T') AS lastUpdtPnttm,
-		       A.LAST_UPDUSR_ID AS lastUpdusrId
-		FROM   ( SELECT  KFT.FRIEND_ID,
-		                KFT.USER_ID,
-		                KFT.SENDER_KEY,
-		                KFT.TEMPLATE_NAME,
-		                KFT.IMAGE_FILE_NAME,
-		                KFT.IMAGE_URL,
-		                KFT.IMAGE_TYPE,
-		                KFT.IMAGE_TITLE,
-		                KFT.IMAGE_LINK,
-		                KFT.TEMPLATE_CONTENTS,
-		                KFT.AD_FLAG,
-		                KFT.FRST_REGIST_PNTTM,
-		                KFT.FRST_REGISTER_ID,
-		                KFT.LAST_UPDT_PNTTM,
-		                KFT.LAST_UPDUSR_ID
-		       FROM     MJ_KAKAO_FRIENDS_TEMPLATE KFT
-		       WHERE    DELETE_YN                                       = 'N'
-		       AND      USER_ID                                         = #userId#
-		       AND      SENDER_KEY                                      = #senderKey#
-		       <isNotEmpty property="searchKeyword">
-		       		AND      KFT.TEMPLATE_NAME                            LIKE CONCAT ('%', #searchKeyword#,'%')
-			   </isNotEmpty>
-		       <isNotEmpty property="startDate">
-				<![CDATA[ 
-		       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
-			       ]]>
-			   </isNotEmpty>
-			   <isNotEmpty property="startDate">
-				<![CDATA[ 
-		       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
-		       ]]>
-			   </isNotEmpty>
-		       ORDER BY 1                                               =1
-		       <isNotEmpty property="searchSortCnd">
-					<isEqual property="searchSortCnd" compareValue="curState">
-						, curState  $searchSortOrd$
-						, orderByrsltCode
-					</isEqual>
-					<isNotEqual  property="searchSortCnd" compareValue="curState">
-						,$searchSortCnd$
-					</isNotEqual>
-				</isNotEmpty>
-				<isNotEmpty property="searchSortOrd">
-					$searchSortOrd$
-				</isNotEmpty>
-				LIMIT  #recordCountPerPage# OFFSET #firstIndex#
-		       )
-		       A
-		       LEFT JOIN MJ_KAKAO_PROFILE_INFO KPI
-		       ON     A.USER_ID    = KPI.USER_ID
-		       AND    A.SENDER_KEY = KPI.SENDER_KEY
+		SELECT COUNT(KFT.FRIEND_ID) OVER() AS totCnt, 
+				KFT.FRIEND_ID AS friendId,
+                KFT.USER_ID AS userId,
+                KFT.SENDER_KEY AS senderKey,
+                KPI.YELLOW_ID AS yellowId,
+                KFT.TEMPLATE_NAME AS templateName,
+                KFT.IMAGE_FILE_NAME AS imageFileName,
+                KFT.IMAGE_URL AS templateImageUrl,
+                KFT.IMAGE_TYPE AS imageType,
+                KFT.IMAGE_TITLE AS imgTitle,
+                KFT.IMAGE_LINK AS imgLink,
+                KFT.TEMPLATE_CONTENTS AS templateContent,
+                KFT.AD_FLAG AS adFlag,
+                DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d %T') AS frstRegistPnttm,
+                KFT.FRST_REGISTER_ID AS frstRegisterId,
+                DATE_FORMAT(KFT.LAST_UPDT_PNTTM, '%Y-%m-%d %T') AS lastUpdtPnttm,
+                KFT.LAST_UPDUSR_ID AS lastUpdusrId
+       FROM     MJ_KAKAO_FRIENDS_TEMPLATE KFT
+       LEFT JOIN MJ_KAKAO_PROFILE_INFO KPI
+       ON     KFT.USER_ID    = KPI.USER_ID
+       AND    KFT.SENDER_KEY = KPI.SENDER_KEY
+       WHERE    KFT.DELETE_YN                                       = 'N'
+       AND      KFT.USER_ID                                         = #userId#
+       AND      KFT.SENDER_KEY                                      = #senderKey#
+       <isNotEmpty property="searchKeyword">
+       		AND      KFT.TEMPLATE_NAME                            LIKE CONCAT ('%', #searchKeyword#,'%')
+	   </isNotEmpty>
+       <isNotEmpty property="startDate">
+		<![CDATA[ 
+       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
+	       ]]>
+	   </isNotEmpty>
+	   <isNotEmpty property="startDate">
+		<![CDATA[ 
+       		AND      DATE_FORMAT(KFT.FRST_REGIST_PNTTM, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d')
+       ]]>
+	   </isNotEmpty>
+       ORDER BY 1                                               =1
+       <isNotEmpty property="searchSortCnd">
+			<isEqual property="searchSortCnd" compareValue="curState">
+				, curState  $searchSortOrd$
+				, orderByrsltCode
+			</isEqual>
+			<isNotEqual  property="searchSortCnd" compareValue="curState">
+				,$searchSortCnd$
+			</isNotEqual>
+		</isNotEmpty>
+		<isNotEmpty property="searchSortOrd">
+			$searchSortOrd$
+		</isNotEmpty>
+		LIMIT  #recordCountPerPage# OFFSET #firstIndex#
+		       
 	
 	</select>
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp
index 94ad53c5..45ccabf7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp
@@ -365,6 +365,13 @@ function updateTemplate(){
 			
 		}
 		
+		if(inputTemplateImageUrl == ''){
+			
+			alert("이미지를 선택해 주세요.");
+			return false;
+			
+		}
+		
 	}
 	
 	
@@ -474,6 +481,7 @@ function fnImageDel(){
 						$("#templateImageUrl").val("");
 						$('.kakao_image').css("display", "none");
 						$("#kakaoImg").attr("src", "");
+						$("#imageFileName").val("");
 						return false;
 						
 					}else{
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 640b2077..87bfae14 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
@@ -184,7 +184,7 @@ $(function(){
 			                        		</c:otherwise>
 			                        	</c:choose>
 			                        </td>
-			                        <td><c:out value="${templatInfoList.lastUpdtPnttm}"/></td>
+			                        <td><c:out value="${templatInfoList.frstRegistPnttm}"/></td>
 			                    </tr>
 			                </c:forEach>	
                 		</c:when>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp
index e3b8e147..20bad5cb 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp
@@ -320,6 +320,13 @@ function addTemplate(){
 			
 		}
 		
+		if(inputTemplateImageUrl == ''){
+			
+			alert("이미지를 선택해 주세요.");
+			return false;
+			
+		}
+		
 	}