Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

src/main/java/com/style24/front/biz/service/TsfGoodsService.java

@@ -432,14 +432,13 @@ public class TsfGoodsService {
 	public int getGoodsStockQty(GoodsStock goodsStock) {
 		int result = 0;
 		// 예약상품 여부 확인
-		int goodsResSellCount = goodsDao.getGoodsResSellCount(goodsStock.getGoodsCd());
+		//int goodsResSellCount = goodsDao.getGoodsResSellCount(goodsStock.getGoodsCd());
 
-		if ("N".equals(goodsStock.getSelfGoodsYn()) || goodsResSellCount > 0) {
+		//if ("N".equals(goodsStock.getSelfGoodsYn()) || goodsResSellCount > 0) {
 			result = goodsDao.getGoodsStockQty(goodsStock);
-		} else {
-			result = goodsDao.getGoodsStoreStockQty(goodsStock);
-		}
-
+		//} else {
+		//	result = goodsDao.getGoodsStoreStockQty(goodsStock);
+		//}
 		return result;
 	}
 
@@ -470,7 +469,7 @@ public class TsfGoodsService {
 		//log.info("[getGoodsSetStockQty] goodsStock = {}", goodsStock);
 
 		// 예약상품 여부 확인
-		int goodsResSellCount = goodsDao.getGoodsResSellCount(goodsStock.getGoodsCd());
+		//int goodsResSellCount = goodsDao.getGoodsResSellCount(goodsStock.getGoodsCd());
 
 		int ableOrderCnt = 0;
 		for (String arrGoodsCd : goodsStock.getArrGoodsOption()) {	// [{goodsCd|optCd|qty},{goodsCd|optCd|qty}]
@@ -485,11 +484,11 @@ public class TsfGoodsService {
 				int qty = Integer.parseInt(goodsSizeInfo[2]);	// 한번에 주문해야하는 상품수량
 //				int stockByGoodsSize = goodsDao.getGoodsStockQty(tmpStock);
 				int stockByGoodsSize = 0;
-				if ("N".equals(goodsStock.getSelfGoodsYn()) || goodsResSellCount > 0) {
+				//if ("N".equals(goodsStock.getSelfGoodsYn()) || goodsResSellCount > 0) {
 					stockByGoodsSize = goodsDao.getGoodsStockQty(tmpStock);
-				} else {
-					stockByGoodsSize = goodsDao.getGoodsStoreStockQty(tmpStock);
-				}
+				//} else {
+				//	stockByGoodsSize = goodsDao.getGoodsStoreStockQty(tmpStock);
+				//}
 
 				//log.info("[getGoodsSetStockQty] stockByGoodsSize = {}", stockByGoodsSize);
 				if (stockByGoodsSize <= 0) {

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1095,7 +1095,7 @@ public class TsfOrderController extends TsfBaseController {
 
 		int count = customerService.getGiftKakaoSendInfo(custContactHst);
 		
-		if (count < 1) {
+		if (count < 50) {
 			// 2021.05.31 알림톡전송 주문완료정보		
 			if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
 				Integer userNo = orderInfo.getCustNo();
@@ -1103,6 +1103,7 @@ public class TsfOrderController extends TsfBaseController {
 				try {
 					orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
 					orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
+					
 					kakaotalkService.sendOrderComplete(orderInfo, userNo);
 					
 					GagaMap replaceInfo = new GagaMap(); 

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

@@ -679,8 +679,8 @@
 	</select>
 	
 	<!-- 상품 사이즈 선택 시 재고수량 가져오기 -->
-	<select id="getGoodsStockQty"  parameterType="GoodsStock" resultType="int">
-		/* TsfGoods.getGoodsStockQty */
+	<select id="getGoodsStockQty_ORG"  parameterType="GoodsStock" resultType="int">
+		/* TsfGoods.getGoodsStockQty_ORG */
 		SELECT (CASE WHEN STOCK_QTY - MIN_ORD_QTY >= 0 THEN STOCK_QTY
 		             ELSE 0 END ) AS STOCK_QTY
 		FROM ( 
@@ -708,6 +708,17 @@
 		) Z
 	</select>
 	
+	<!-- 상품 사이즈 선택 시 재고수량 가져오기 -->
+	<select id="getGoodsStockQty"  parameterType="GoodsStock" resultType="int">
+		/* TsfGoods.getGoodsStockQty */
+		SELECT CASE WHEN SOLDOUT_YN = 'Y' THEN 0
+		            ELSE CURR_STOCK_QTY END AS CURR_STOCK_QTY
+		FROM VW_STOCK
+		WHERE GOODS_CD =  #{goodsCd}
+		AND OPT_CD = #{optCd}
+		
+	</select>
+	
 	<!-- 상품 사이즈  매장 쵀대 재고수량 가져오기 -->
 	<select id="getGoodsStoreStockQty"  parameterType="GoodsStock" resultType="int">
 		/* TsfGoods.getGoodsStoreStockQty */

src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -607,12 +607,20 @@
 		},
 	});
 
+	// 스크립트 제거
+	function fnRemoveHTML(text){
+		text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+		text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+		text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+		return text;
+	}
+
 	// 브랜드메인 배너 <br> 처리
 	$('.bMainTitle').each(function (){
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=mainTitle]").val())){
 			var brText = $(this).find("input[name=mainTitle]").val();
-			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag = fnRemoveHTML(brText);
 			$(this).append(tag);
 		}
 	});
@@ -620,13 +628,13 @@
 	// 브랜드소개 <br> 처리
 	if(!gagajf.isNull($("#brandDesc").find("input[name=brandTitle]").val())){
 		var brandDesc = $("#brandDesc").find("input[name=brandTitle]").val();
-		var tag = brandDesc.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		var tag = fnRemoveHTML(brandDesc);
 		$("#brandDesc .cate").append(tag);
 	}
 
 	if(!gagajf.isNull($("#brandDesc").find("input[name=brandNote]").val())){
 		var brandDesc = $("#brandDesc").find("input[name=brandNote]").val();
-		var tag = brandDesc.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		var tag = fnRemoveHTML(brandDesc);
 		$("#brandDesc .desc").append(tag);
 	}
 
@@ -635,7 +643,7 @@
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=bannerDesc]").val())){
 			var brText = $(this).find("input[name=bannerDesc]").val();
-			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag = fnRemoveHTML(brText);
 			$(this).append(tag);
 		}
 	});

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -47,8 +47,9 @@
 					</div>
 				</th:block>
 
-				<th:block th:if="${contentsLoc=='004'}">
-					<div class="inner bg_gray">
+<!--				<th:block th:if="${contentsLoc=='004'}">-->
+				<th:block th:if="${mainStat.index==1}" th:style="${'display:block'}" th:data="${mainStat.index}">
+					<div class="inner bg_gray" >
 						<div class="sub_category">
 							<div class="cate_wrap">
 							</div>
@@ -60,6 +61,8 @@
 					</div>
 				</th:block>
 
+<!--				</th:block>-->
+
 				<th:block th:if="${contentsLoc=='002'}">
 					<div class="inner wide" th:if="${newGoodsList != null}">
 						<div class="new_item">
@@ -196,12 +199,20 @@
 			});
 		}
 
+		// 스크립트 제거
+		function fnRemoveHTML(text){
+			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return text;
+		}
+
 		// 배너 슬라이더 <br> 처리
 		$('.bText').each(function (){
 			let tag = '';
 			if(!gagajf.isNull($(this).find("input[name=bannerTitle]").val())){
 				var brText = $(this).find("input[name=bannerTitle]").val();
-				tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				tag = fnRemoveHTML(brText);
 				$(this).append(tag);
 			}
 		});

src/main/webapp/WEB-INF/views/mob/display/LookbookMainFormMob.html

@@ -135,7 +135,6 @@
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
-		$("#filterChkArea").show();
 		$("#filter").show();
 		totalCnt = result.paging.totalCount;
 		$("#lookbookTotCnt").text(totalCnt);
@@ -223,10 +222,12 @@
 					var brandNm = $(this).find('span').text();
 					tag2 += '<a href="javascript:void(0);" onclick="fnDeleteBrandFilter(\''+brandCd+'\');">'+brandNm+'</a>';
 					$('#chkBrand').html(tag2);
+					$("#filterChkArea").show();
 				}else{
 					$(this).addClass("on");
 					tag2 += '<a href="javascript:void(0);" onclick="fnDeleteBrandFilter("");">전체</a>';
 					$('#chkBrand').html(tag2);
+					$("#filterChkArea").hide();
 				}
 			}
 		});
@@ -239,6 +240,7 @@
 					$(this).addClass("on");
 				}
 			});
+			$("#filterChkArea").hide();
 		}
 
 		fnLookbookInfiniteScrollInit();
@@ -249,9 +251,9 @@
 	var fnLookbookReset = function (){
 		$("#lbMainForm input:hidden[name=multiBrandCd]").remove();
 
-		var tag2 = '';
-		tag2 += '<a href="javascript:void(0);" onclick="fnDeleteBrandFilter(\'\');">전체</a>';
-		$('#chkBrand').html(tag2);
+		// var tag2 = '';
+		// tag2 += '<a href="javascript:void(0);" onclick="fnDeleteBrandFilter(\'\');">전체</a>';
+		// $('#chkBrand').html(tag2);
 
 		$(".button_list button").each(function (index) {
 			$(this).removeClass("on");
@@ -261,6 +263,7 @@
 
 		fnLookbookInfiniteScrollInit();
 		fnLookbookListSearch();
+		$("#filterChkArea").hide();
 		//fnGetBrandLookbookList();
 	}
 
@@ -382,6 +385,7 @@
 	$(document).ready(function(){
 		// fnGetLookbookList(lookbookGb,brandCd);
 		//fnLookbookListSearch();
+		$("#filterChkArea").hide();
 		fnLookbookReset();
 
 		if(lookbookGb=='BL'){

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -795,6 +795,14 @@
 				return (n < 10 ? '0' : '') + n;
 			}
 		}
+
+		// 스크립트 제거
+		function fnRemoveHTML(text){
+			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return text;
+		}
 		// 컨텐츠 호출
 		$(document).ready(function() {
 			post_visual.slideTo(2, 0, false); // 접속 시, 슬라이드페이지 이동
@@ -809,21 +817,21 @@
 			// 몰메인 <br> 태그
 			$('.mainTitle').each(function (){
 				var brText = $(this).find("input[name=mainTitlee]").val();
-				let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				let tag = fnRemoveHTML(brText);
 				$(this).append(tag);
 			});
 
 			// 몰메인 <br> 태그
 			$('.mainSubTitle').each(function (){
 				var brText = $(this).find("input[name=mainSubTitlee]").val();
-				let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				let tag = fnRemoveHTML(brText);
 				$(this).append(tag);
 			});
 
 			// 브랜드픽 <br> 태그
 			$('#id007 .title').each(function (){
 				var brText = $(this).find("input[name=title]").val();
-				let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				let tag = fnRemoveHTML(brText);
 				$(this).append(tag);
 			});
 
@@ -832,7 +840,7 @@
 				let tag = '';
 				if(!gagajf.isNull($(this).find("input[name=bannerNote]").val())) {
 					var noteText = $(this).find("input[name=bannerNote]").val();
-					tag = noteText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+					tag = fnRemoveHTML(noteText);
 					$(this).find('.noteArea').append(tag);
 				}
 			});
@@ -843,13 +851,13 @@
 				let tag2 = '';
 				if(!gagajf.isNull($(this).find("input[name=styleTitle]").val())) {
 					var titleText = $(this).find("input[name=styleTitle]").val();
-					tag = titleText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+					tag = fnRemoveHTML(titleText);
 					$(this).find('.styleTitleC').append(tag);
 				}
 
 				if(!gagajf.isNull($(this).find("input[name=styleNote]").val())) {
 					var noteText = $(this).find("input[name=styleNote]").val();
-					tag2 = noteText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+					tag2 = fnRemoveHTML(noteText);
 					$(this).find('.styleNoteC').append(tag2);
 				}
 			});

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -47,12 +47,14 @@
 					</div>
 				</th:block>
 
-				<th:block th:if="${contentsLoc=='004'}">
+<!--				<th:block th:if="${contentsLoc=='004'}">-->
+				<th:block th:if="${mainStat.index==1}" th:style="${'display:block'}" th:data="${mainStat.index}">
 					<div class="inner wide bg_gray">
 						<div class="dp_cate_list">
 						</div>
 					</div>
 				</th:block>
+<!--				</th:block>-->
 
 				<th:block th:if="${contentsLoc=='002'}">
 					<div class="inner wide" th:if="${mdPickGoodsList != null}">
@@ -184,11 +186,19 @@
 			$('.dp_cate_list').html(tag);
 		}
 
+		// 스크립트 제거
+		function fnRemoveHTML(text){
+			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return text;
+		}
+
 		$('.subject').each(function (){
 			let tag = '';
 			if(!gagajf.isNull($(this).find("input[name=mainTitle]").val())) {
 				var brText = $(this).find("input[name=mainTitle]").val();
-				tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				tag = fnRemoveHTML(brText);
 				$(this).append(tag);
 			}
 		});

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -1166,7 +1166,7 @@ var paymentInfoSet = function() {
 					
 					// 주문제작상품일때 주문제작정보동의
 					if (orderMadeYn == "Y") {
-						if (!$("#orderForm #chk-custom-agr1").is(":checked")) {
+						if (!$("#orderForm #chk-custom").is(":checked")) {
 							mcxDialog.alert("주문제작상품에 대한 동의를 하지 않으실 경우 해당 상품을 쇼핑백에서 제외하신 후 다시 결제를 시도해주세요.");
 							
 							// 배송정보화면노출

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -836,21 +836,20 @@ $(document).ready( function() {
 		});
 	}
 
+	// 스크립트 제거
+	function fnRemoveHTML(text){
+		text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+		text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+		text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+		return text;
+	}
+
 	// 브랜드메인 배너 <br> 처리
 	$('.bMainTitle').each(function (){
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=mainTitle]").val())){
 			var brText = $(this).find("input[name=mainTitle]").val();
-			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
-			// var brText = $(this).find("input[name=mainTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>").replaceAll("<br/>", "<br>");
-			// if(brText.indexOf('<br>') > -1){
-			// 	var reText = brText.split("<br>");
-			// 	tag += reText[0];
-			// 	tag += '<br>';
-			// 	tag += reText[1];
-			// }else{
-			// 	tag += brText;
-			// }
+			tag = fnRemoveHTML(brText);
 			$(this).append(tag);
 		}
 	});
@@ -858,16 +857,13 @@ $(document).ready( function() {
 	// 브랜드소개 <br> 처리
 	if(!gagajf.isNull($("#brandDesc").find("input[name=brandTitle]").val())){
 		var brandDesc = $("#brandDesc").find("input[name=brandTitle]").val();
-		var tag = brandDesc.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
-		// tag = brandDesc.replace(/(<br>|<br\/>|<br \/>)/g, '\r\n');
-		// var brandDesc = $("#brandDesc").find("input[name=brandTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
+		var tag = fnRemoveHTML(brandDesc);
 		$("#brandDesc .cate").append(tag);
 	}
 
 	if(!gagajf.isNull($("#brandDesc").find("input[name=brandNote]").val())){
 		var brandDesc = $("#brandDesc").find("input[name=brandNote]").val();
-		var tag = '';
-		tag = brandDesc.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		var tag = fnRemoveHTML(brandDesc);
 		$("#brandDesc .desc").append(tag);
 	}
 
@@ -876,18 +872,7 @@ $(document).ready( function() {
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=bannerDesc]").val())){
 			var brText = $(this).find("input[name=bannerDesc]").val();
-			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
-			/*var brText = $(this).find("input[name=bannerDesc]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>").replaceAll("<br/>", "<br>");
-			if(brText.indexOf('<br>') > -1){
-				var reText = brText.split("<br>");
-				tag += reText[0];
-				tag += '</p>';
-				tag += '<p>';
-				tag += reText[1];
-				tag += '</p>';
-			}else{
-				tag += brText;
-			}*/
+			tag = fnRemoveHTML(brText);
 			$(this).append(tag);
 		}
 	});

src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -253,12 +253,20 @@
 		});
 	}
 
+	// 스크립트 제거
+	function fnRemoveHTML(text){
+		text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+		text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+		text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+		return text;
+	}
+
 	// 배너 슬라이더 <br> 처리
 	$('.bText').each(function (){
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=bannerTitle]").val())){
 			var brText = $(this).find("input[name=bannerTitle]").val();
-			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag = fnRemoveHTML(brText);
 			$(this).append(tag);
 		}
 	});

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -1475,17 +1475,26 @@ if (mainTvLength < 2) {
 	});
 }
 
+// 스크립트 제거
+function fnRemoveHTML(text){
+	text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+	text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+	text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+	return text;
+}
+
 $(document).ready(function() {
 	// 몰메인 <br> 태그
 	$('.mainTitle').each(function (){
 		var brText = $(this).find("input[name=mainTitlee]").val();
-		let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		// let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		let tag = fnRemoveHTML(brText);
 		$(this).append(tag);
 	});
 
 	$('.mainSubTitle').each(function (){
 		var brText = $(this).find("input[name=mainSubTitlee]").val();
-		let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		let tag = fnRemoveHTML(brText);
 		$(this).append(tag);
 	});
 
@@ -1494,7 +1503,7 @@ $(document).ready(function() {
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=bannerNote]").val())) {
 			var noteText = $(this).find("input[name=bannerNote]").val();
-			tag = noteText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag = fnRemoveHTML(noteText);
 			$(this).find('.noteArea').append(tag);
 		}
 	});
@@ -1505,13 +1514,13 @@ $(document).ready(function() {
 		let tag2 = '';
 		if(!gagajf.isNull($(this).find("input[name=styleTitle]").val())) {
 			var titleText = $(this).find("input[name=styleTitle]").val();
-			tag = titleText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag = fnRemoveHTML(titleText);
 			$(this).find('.styleTitleC').append(tag);
 		}
 
 		if(!gagajf.isNull($(this).find("input[name=styleNote]").val())) {
 			var noteText = $(this).find("input[name=styleNote]").val();
-			tag2 = noteText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag2 = fnRemoveHTML(noteText);
 			$(this).find('.styleNoteC').append(tag2);
 		}
 	});
@@ -1519,14 +1528,14 @@ $(document).ready(function() {
 	// 잇아이템 <br> 태그
 	if(!gagajf.isNull($("#id004").find("input[name=title]").val())){
 		var id004Text = $("#id004").find("input[name=title]").val();
-		let tag = id004Text.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		let tag = fnRemoveHTML(id004Text);
 		$("#id004").append(tag);
 	}
 
 	// 핫딜 <br> 태그
 	if(!gagajf.isNull($("#id006").find("input[name=title]").val())){
 		var id006Text = $("#id006").find("input[name=title]").val();
-		let tag = id006Text.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		let tag = fnRemoveHTML(id006Text);
 		$("#id006").append(tag);
 	}
 
@@ -1535,7 +1544,7 @@ $(document).ready(function() {
 		let tag = '';
 		if(!gagajf.isNull($(this).find("input[name=title]").val())){
 			var brText = $(this).find("input[name=title]").val();
-			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			tag = fnRemoveHTML(brText);
 			$(this).append(tag);
 		}
 	});

src/main/webapp/WEB-INF/views/web/display/OutletMainFormWeb.html

@@ -247,11 +247,19 @@
 		$('.dp_cate_list').html(tag);
 		// $('.cate1Nm').html(cate1.cate1Nm);
 
+		// 스크립트 제거
+		function fnRemoveHTML(text){
+			text = text.replace(/(<br>|<br\/>|<br \/>)/g, "\n");
+			text = text.replace(/<(\/)?([a-zA-Z]*)(\s[a-zA-Z]*=[^>]*)?(\s)*(\/)?>/ig, "");
+			text = text.replace(/(?:\r\n|\r|\n)/g, '<br/>');
+			return text;
+		}
+
 		$('.subject').each(function (){
 			let tag = '';
 			if(!gagajf.isNull($(this).find("input[name=mainTitle]").val())) {
 				var brText = $(this).find("input[name=mainTitle]").val();
-				tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				tag = fnRemoveHTML(brText);
 				$(this).append(tag);
 			}
 		});