Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml

@@ -17,6 +17,24 @@
 	<!-- GNB 브랜드그룹 목록 -->
 	<select id="getGnbBrandGroupList" parameterType="Contents" resultType="BrandGroup">
 		/* TsfDisplay.getGnbBrandGroupList */
+		WITH TAB AS (
+		    SELECT  STR_TITLE3
+		    FROM
+		<choose>
+		    <when test='preview != null and preview == "Y"'>
+		        TB_CONTENTS_PREVIEW
+		    </when>
+		    <otherwise>
+		        TB_CONTENTS
+		    </otherwise>
+		</choose>
+		    WHERE 1=1
+		    AND   CONTENTS_LOC = #{contentsLoc}
+		    AND   DISP_STDT <![CDATA[<=]]> NOW()
+		    AND   DISP_EDDT <![CDATA[>=]]> NOW()
+		    GROUP BY STR_TITLE3
+		    LIMIT 1
+		)
 		SELECT B.STR_TITLE1     AS TITLE
 		     , A.BRAND_GROUP_NO
 		     , CASE WHEN A.DISP_NM_LANG = 'EN' THEN A.BRAND_GROUP_ENM
@@ -34,7 +52,9 @@
 		     , TB_CONTENTS B
 		    </otherwise>
 		</choose>
-		WHERE  A.BRAND_GROUP_NO = B.STR_VAR1
+		     , TAB C
+		WHERE  B.STR_TITLE3 = C.STR_TITLE3
+		AND    A.BRAND_GROUP_NO = B.STR_VAR1
 		AND    A.USE_YN = 'Y'
 		AND    B.CONTENTS_LOC = #{contentsLoc}
 		<choose>

src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -55,12 +55,13 @@
 			let html = '';
 			$.each(pushListJosn.pushList, function(idx, item) {
 				if (_osType === 'I') {
-					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.title.toLowerCase()) + 'escape :' + escape(item.title)
-					 + ' unescape :' + unescape(item.title)
-					 + ' encodeURI:' + encodeURI(item.title)
-					 + ' decodeURI:' + decodeURI(item.title)
-					 + ' encodeURIComponent:' + encodeURIComponent(item.title)
-					 + ' decodeURIComponent:' + decodeURIComponent(item.title)
+					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.content.toLowerCase())
+					 + 'escape :' + escape(item.content)
+					 + ' unescape :' + unescape(item.content)
+					 + ' encodeURI:' + encodeURI(item.content)
+					 + ' decodeURI:' + decodeURI(item.content)
+					 + ' encodeURIComponent:' + encodeURIComponent(item.content)
+					 + ' decodeURIComponent:' + decodeURIComponent(item.content)
 					);
 				}
 				html += '<div class="inner">\n';