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

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

@@ -1094,14 +1094,11 @@ public class TsfCartService {
 	}
 
 	public Cart getCartGoodsInfo(Cart param) {
-		// Collection<Cart> result = new ArrayList<Cart>();
-		/* cart.add(cartDao.selectCartGoodsInfo(param)); */
-
 		// 장바구니 상품 마스터 정보 조회
 		param.setFrontGb(TsfSession.getFrontGb());
 		Cart cart = cartDao.selectCartGoodsInfo(param);
 		if(cart == null) {
-			throw new IllegalArgumentException("장바구니 상품 정보가 없습니다.<br/>새로고침 후 다시 시도해주세요.");
+			throw new IllegalStateException("장바구니 상품 정보가 없습니다.\n새로고침 후 다시 시도해주세요.");
 		}
 
 		if(TscConstants.GoodsStat.SOLDOUT.value().equals(cart.getGoodsStat())) {

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

@@ -3,7 +3,6 @@ package com.style24.front.biz.service;
 import java.io.File;
 import java.util.Collection;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -18,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.util.GagaDateUtil;
 import com.gagaframework.web.util.GagaFileUtil;
-import com.gagaframework.web.util.GagaStringUtil;
 
 /**
  * 상담(1:1문의) Service
@@ -32,7 +30,7 @@ public class TsfCounselService {
 
 	@Autowired
 	private TsfCounselDao counselDao;
-	
+
 	@Autowired
 	private Environment env;
 
@@ -52,12 +50,12 @@ public class TsfCounselService {
 		counsel.setRegNo(TsfSession.getInfo().getCustNo());
 		counsel.setUpdNo(TsfSession.getInfo().getCustNo());
 		counselDao.createOneToOneQna(counsel);
-		
-		if(counsel.getOrgFileNmArr() != null) {
+
+		if (counsel.getOrgFileNmArr() != null) {
 			int ind = 1;
 			String[] orgItem = counsel.getOrgFileNmArr();
 			String[] sysItem = counsel.getSysFileNmArr();
-			
+
 			for (int i = 0; i < orgItem.length; i++) {
 				if (orgItem[i] != "") {
 					String imgInd = String.valueOf(ind);
@@ -77,11 +75,11 @@ public class TsfCounselService {
 						path.mkdir();
 					}
 					newFile.renameTo(uniqueFile);
-					
+
 					if (i == 0) {
 						counsel.setOrgFileNm1(orgItem[i]);
 						counsel.setSysFileNm1("/counsel/" + yearMonth + "/" + newFilename);
-					}else {
+					} else {
 						counsel.setOrgFileNm2(orgItem[i]);
 						counsel.setSysFileNm2("/counsel/" + yearMonth + "/" + newFilename);
 					}
@@ -124,15 +122,7 @@ public class TsfCounselService {
 	 * @since 2020. 12. 28
 	 */
 	public Collection<Counsel> getOneToOneQnaList(Counsel counsel) {
-		Collection<Counsel> counselList = counselDao.getOneToOneQnaList(counsel);
-		if (counselList != null && !counselList.isEmpty()) {
-			for (Counsel item : counselList) {
-				item.setQuestContent(GagaStringUtil.replace(item.getQuestContent(), "\r\n", "<br/>"));
-				item.setAnsContent(GagaStringUtil.replace(item.getAnsContent(), "\r\n", "<br/>"));
-			}
-		}
-
-		return counselList;
+		return counselDao.getOneToOneQnaList(counsel);
 	}
 
 	/**
@@ -200,7 +190,7 @@ public class TsfCounselService {
 			throw new IllegalStateException("답변이 완료되지 않아 삭제할 수 없습니다.");
 		}
 	}
-	
+
 	/**
 	 * 1:1문의 사진 리스트
 	 * @param counsel -상담정보
@@ -208,7 +198,7 @@ public class TsfCounselService {
 	 * @author sowon
 	 * @since 2021. 06. 214
 	 */
-	public Collection<Counsel> getOneToOneImgList(Counsel counsel){
+	public Collection<Counsel> getOneToOneImgList(Counsel counsel) {
 		return counselDao.getOneToOneImgList(counsel);
 	}
 
@@ -262,13 +252,7 @@ public class TsfCounselService {
 	 * @since 2020. 12. 24
 	 */
 	public Collection<Counsel> getGoodsQnaList(Counsel counsel) {
-		Collection<Counsel> counselList = counselDao.getGoodsQnaList(counsel);
-		for (Counsel item : counselList) {
-			item.setQuestContent(GagaStringUtil.replace(item.getQuestContent(), "\r\n", "<br/>"));
-			item.setAnsContent(GagaStringUtil.replace(item.getAnsContent(), "\r\n", "<br/>"));
-		}
-
-		return counselList;
+		return counselDao.getGoodsQnaList(counsel);
 	}
 
 	/**

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

@@ -876,4 +876,38 @@ public class TsfDisplayService {
 		return "http:" + GagaFileUtil.getConcatenationPath(env.getProperty("upload.image.view"), "splashimg", splashImg);
 	}
 
+	/**
+	 * 몰메인 신상풍 목록
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @date 2021. 7. 13
+	 */
+	public Collection<Contents> getMainNewGoodsList(Contents contents) {
+		Collection<Contents> contentsList = displayDao.getBestItemCategoryList(contents);
+		Cate4Srch tempCate = new Cate4Srch();
+
+		for (Contents data : contentsList) {
+			tempCate.setContentsLoc(data.getContentsLoc());
+			tempCate.setMaxRow(20);
+			tempCate.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
+			tempCate.setSiteCd(data.getSiteCd());
+			tempCate.setCateGb(data.getCateGb());
+			data.setGoodsList(goodsDao.getContentsCategoryNewGoodsList(tempCate));
+		}
+
+		return contentsList;
+	}
+
+	/**
+	 * 몰메인 신상품 목록
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @date 2021. 7. 13
+	 */
+	public Collection<Goods> getContentsCategoryNewGoodsList(Cate4Srch cate4Srch){
+		return goodsDao.getContentsCategoryNewGoodsList(cate4Srch);
+	}
+
 }

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

@@ -1051,7 +1051,7 @@ public class TsfGoodsService {
 					temp.setBenefitArr(temp.getIcon().split(","));
 				}
 			}
-		} else if (cate.getContentsLoc().equals("SOM003")) {
+		} else if (cate.getContentsLoc().equals("SOM003") || cate.getContentsLoc().equals("SOM002")) {
 			goodsList = goodsDao.getContentsCategoryGoodsList(cate);
 			for (Goods temp : goodsList) {
 				if (temp.getSizes() != null) {

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

@@ -162,6 +162,7 @@ public class TsfDisplayController extends TsfBaseController {
 			String contentsLoc = mainLayout.getContentsLoc();
 			Contents contents = new Contents();
 			log.info("mallMain contentsLoc:::{}", contentsLoc);
+			contents.setContentsCnt(mainLayout.getContentsCnt());
 			contents.setContentsLoc(contentsLoc);
 			contents.setPreview(paramMap.get("preview"));
 			contents.setViewDt(paramMap.get("viewDt"));
@@ -221,7 +222,11 @@ public class TsfDisplayController extends TsfBaseController {
 			}
 
 			if (contentsLoc.equals("SMM003") || contentsLoc.equals("SBM007")) {
-				mainLayout.setNewItemList(displayService.getContentsForGoods(contents));
+				if(Integer.parseInt(mainLayout.getContentsCnt()) > 0){
+					mainLayout.setNewItemList(displayService.getContentsForGoods(contents));
+				}else{
+					mainLayout.setNewItemList(displayService.getMainNewGoodsList(contents));
+				}
 			}
 
 			mainLayoutList.add(mainLayout);
@@ -471,11 +476,24 @@ public class TsfDisplayController extends TsfBaseController {
 				contents.setMaxRow(1);
 				Collection<Contents> conList = displayService.getContentsList(contents);
 				mav.addObject("newGoodsList", null);
-
-				for (Contents contentsData : conList) {
-					cate.setContentsLoc("SCM002");
-					cate.setMaxRow(20);
-					mav.addObject("newGoodsList", goodsService.getContentsCategoryGoodsList(cate));
+				if(Integer.parseInt(cateMain.getContentsCnt()) > 0){
+					for (Contents contentsData : conList) {
+						cate.setContentsLoc("SCM002");
+						cate.setMaxRow(20);
+						mav.addObject("newGoodsList", goodsService.getContentsCategoryGoodsList(cate));
+					}
+				}else{
+					Collection<Contents> contentsList = displayService.getBestItemCategoryList(contents);
+					Cate4Srch tempCate = new Cate4Srch();
+					for (Contents data : contentsList) {
+						tempCate.setContentsLoc(data.getContentsLoc());
+						tempCate.setMaxRow(20);
+						tempCate.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
+						tempCate.setSiteCd(data.getSiteCd());
+						tempCate.setCateGb(data.getCateGb());
+						tempCate.setCate1No(data.getCateNo());
+					}
+					mav.addObject("newGoodsList", displayService.getContentsCategoryNewGoodsList(tempCate));
 				}
 			} else if ("SCM003".equals(cateMain.getContentsLoc())) {
 				// 베스트품

src/main/java/com/style24/persistence/domain/Contents.java

@@ -84,6 +84,8 @@ public class Contents extends TscBaseDomain {
 	private Collection<Goods> goodsList;	// 카테고리목록
 	private Collection<Contents> bannerList;	// 카테고리목록
 
+	private String contentsCnt;     // 브랜드메인에서 사용
+
 	private TscPageRequest pageable;				// 페이징
 	private int pageNo = 1;
 	private int pageSize = 50;

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

@@ -1136,6 +1136,9 @@
 		WHERE 1=1
 		AND CATE_TYPE = 'G031_20'
 		AND	CONTENTS_LOC = #{contentsLoc}
+		<if test="cateNo != null and cateNo != ''">
+		AND CATE1_NO = #{cateNo}
+		</if>
 	</select>
 
 	<!-- 브랜드 전체 이미지 리스트 조회 -->

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

@@ -1430,7 +1430,7 @@
 		/* TsfGoods.getContentsCategoryGoodsList */
 		WITH TAB_GOODS AS (
 		    SELECT
-		           <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003'">
+		           <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SOM002'">
 					   DISTINCT
 				   </if>
 		           G.BRAND_GROUP_NM     /*브랜드그룹명*/
@@ -1477,7 +1477,7 @@
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
 		                 , CT.DISP_ORD
 		                </when>
-		                <when test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'">
+		                <when test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003' or contentsLoc == 'SOM002'">
 		                , CTG.DISP_ORD
 		                </when>
 		                 <otherwise>
@@ -1489,7 +1489,7 @@
 		                 , CT.CATE_NO AS CATE1_NO
 		            </if>
 		            <choose>
-		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012' or contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'"> <!-- md추천 -->
+		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012' or contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003' or contentsLoc == 'SOM002'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TB_CONTENTS_GOODS CTG
 		                    , TB_GOODS G 
@@ -1516,7 +1516,7 @@
 		                    <if test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
 		                    AND 	CTG.CONTENTS_SQ = #{dispOrd}
 		                    </if>
-		                    <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003'">
+		                    <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003' or contentsLoc == 'SOM002'">
 		                    AND CT.CONTENTS_SQ IN ( SELECT TMP.CONTENTS_SQ FROM (SELECT A.CONTENTS_SQ FROM TB_CONTENTS A WHERE 1=1 AND A.CONTENTS_LOC = #{contentsLoc} AND NOW() BETWEEN A.DISP_STDT AND A.DISP_EDDT
 		                                                                                    <if test="brandGroupNo != null and brandGroupNo != ''">
 		                                                                                        AND A.BRAND_GROUP_NO = #{brandGroupNo}

src/main/webapp/WEB-INF/views/mob/callcenter/GoodsQnaFormMob.html

@@ -87,24 +87,6 @@
 		gagajf.ajaxFormSubmit($('#qnaForm').prop('action'), '#qnaForm', fnGetListCallback);
 	});
 	
-    var fnReplaceBr = function(obj){
-        let tag = '';
-        if(!gagajf.isNull(obj)){
-            var brText = obj;
-            tag = brText.replace(/(&lt;br\/&gt;)/g, '<br>');
-        }
-        return tag;
-    }
-    
-	var fnSplitBr = function(obj){
-        let tag = '';
-        if(!gagajf.isNull(obj)){
-            var brText = obj;
-            tag = brText.split('&lt;br/&gt');
-        }
-        return tag[0];
-    }
-    
 	// QNA 콜백함수
 	var fnGetListCallback = function(result) {
 		// 목록
@@ -119,7 +101,7 @@
 				tag += '						<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '"">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
 				tag += '						<span class="prod">' + item.goodsNm + ' ' + item.relGoodsCd + '</span>\n';
 				tag += '					</div>\n';
-				tag += '					<div class="lap2"><span>' + fnSplitBr(item.questContent.escapeHtml()) + '</span></div>\n';
+				tag += '					<div class="lap2"><span>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</span></div>\n';
 				tag += '				</div>\n';
 				tag += '				<span class="data">' + item.questDt + '</span>\n';
 				tag += '			</div>\n';
@@ -128,14 +110,14 @@
 				tag += '	<div class="fold_cont">\n';
 				tag += '		<div class="fold_detail">\n';
 				tag += '			<div>\n';
-				tag += '				<p>' + fnReplaceBr(item.questContent.escapeHtml()) + '</p>\n';
+				tag += '				<p>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</p>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';
 				
 				if (item.ansStat == 'G060_20') { // 답변완료일 때
 					tag += '		<div class="fold_answer">\n';
 					tag += '			<div>\n';
-					tag += '				<div class="answer_body">' + fnReplaceBr(item.ansContent.escapeHtml()) + '</div>\n';
+					tag += '				<div class="answer_body">' + item.ansContent.replace(/(\r\n)/g, '<br/>') + '</div>\n';
 					tag += '				<div class="answer_foot">\n';
 					tag += '					<span class="data">' + item.ansDt + '</span>\n';
 					tag += '					<button type="button" class="btn_delete" onclick="fnDeleteQna(' + item.counselSq + ');"><span>삭제</span></button>\n';

src/main/webapp/WEB-INF/views/mob/callcenter/OneToOneQnaFormMob.html

@@ -295,15 +295,6 @@
 		gagajf.ajaxFormSubmit($('#qnaForm').prop('action'), '#qnaForm', fnGetListCallback);
 	});
 	
-	var fnReplaceBr = function(obj){
-        let tag = '';
-        if(!gagajf.isNull(obj)){
-            var brText = obj;
-            tag = brText.replace(/(&lt;br\/&gt;)/g, '<br>');
-        }
-        return tag;
-    }
-	
 	// QNA 콜백함수
 	var fnGetListCallback = function(result) {
 		// 목록
@@ -318,7 +309,7 @@
 				tag += '						<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
 				tag += '						<span class="prod">' + item.counselClsfNm + '</span>\n';
 				tag += '					</div>\n';
-				tag += '					<div class="lap2"><span>' + item.questTitle.escapeHtml() + '</span></div>\n';
+				tag += '					<div class="lap2"><span>' + item.questTitle + '</span></div>\n';
 				tag += '				</div>\n';
 				tag += '				<span class="data">' + item.questDt + '</span>\n';
 				tag += '			</div>\n';
@@ -326,7 +317,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont">\n';
 				tag += '		<div class="fold_detail">\n';
-				tag += '			<div><p>' + fnReplaceBr(item.questContent.escapeHtml()) + '</p></div>\n';
+				tag += '			<div><p>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</p></div>\n';
 				
 				if (!gagajf.isNull(item.sysFileNm1) || !gagajf.isNull(item.sysFileNm2)) {
 					tag += '		<p class="img_group">\n';
@@ -353,7 +344,7 @@
 				if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
 					tag += '	<div class="fold_answer">\n';
 					tag += '		<div>\n';
-					tag += '			<div class="answer_body">' + fnReplaceBr(item.ansContent.escapeHtml()) + '</div>\n';
+					tag += '			<div class="answer_body">' + item.ansContent.replace(/(\r\n)/g, '<br/>') + '</div>\n';
 					tag += '			<div class="answer_foot">\n';
 					tag += '				<span class="data">' + item.ansDt + '</span>\n';
 					

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewFormMob.html

@@ -196,7 +196,7 @@
 						html += '		</div>\n';
 					}
 					html += '		<div class="txt_review_box" id="admin_'+item.reviewSq+'">\n';
-					html += '			<p>'+item.reviewContent.escapeHtml()+'</p>\n';
+					html += '			<p style="white-space:pre;">'+item.reviewContent.escapeHtml()+'</p>\n';
 					html += '		</div>\n';
 					html += '		<div  class="response_box2">\n';
 					html += '			<div>\n';

src/main/webapp/WEB-INF/views/web/callcenter/GoodsQnaFormWeb.html

@@ -107,25 +107,6 @@
 		gagaPaging.load(1);
 	}
 	
-	var fnReplaceBr = function(obj){
-        let tag = '';
-        if(!gagajf.isNull(obj)){
-            var brText = obj;
-            tag = brText.replace(/(&lt;br\/&gt;)/g, '<br>');
-        }
-        return tag;
-    }
-	
-
-	var fnSplitBr = function(obj){
-        let tag = '';
-        if(!gagajf.isNull(obj)){
-            var brText = obj;
-            tag = brText.split('&lt;br/&gt');
-        }
-        return tag[0];
-    }
-
 	var idx = 1;
 	var fnGetListCallback = function(result) {
 		$('#ulQna').html('');
@@ -140,7 +121,7 @@
 				tag += '				<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
 				tag += '				<div class="fold_tit">\n';
 				tag += '					<span class="prod">' + item.goodsNm + ' ' + item.relGoodsCd + '</span>\n';
-				tag += '					<span>' + fnSplitBr(item.questContent.escapeHtml()) + '</span>\n';
+				tag += '					<span>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</span>\n';
 				tag += '				</div>\n';
 				tag += '				<span class="data">' + item.questDt + '</span>\n';
 				tag += '			</div>\n';
@@ -149,7 +130,7 @@
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n'; //문의 내용
 				tag += '			<div>\n';
-				tag += '				<p>' + fnReplaceBr(item.questContent.escapeHtml()) + '</p>\n';
+				tag += '				<p>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</p>\n';
 				tag += '			</div>\n';
 				
 				if (item.ansStat == 'G060_20') { // 답변완료일 때
@@ -161,7 +142,7 @@
 				if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
 					tag += '		<div class="fold_answer">\n'; //문의 답변
 					tag += '			<div class="answer_head">답변이 등록되었습니다.</div>\n';
-					tag += '			<div class="answer_body">' + fnReplaceBr(item.ansContent.escapeHtml()) + '</div>\n';
+					tag += '			<div class="answer_body">' + item.ansContent.replace(/(\r\n)/g, '<br/>') + '</div>\n';
 					tag += '			<span class="data">' + item.ansDt + '</span>\n';
 					tag += '		</div>\n';
 				}

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaFormWeb.html

@@ -170,16 +170,7 @@
 		gagaPaging.load(1);
 	}
 	
-	var fnReplaceBr = function(obj){
-        let tag = '';
-        if(!gagajf.isNull(obj)){
-            var brText = obj;
-            tag = brText.replace(/(&lt;br\/&gt;)/g, '<br>');
-        }
-        return tag;
-    }
-
-    var idx = 1;
+	var idx = 1;
 	var fnGetListCallback = function(result) {
 		$('#ulQna').html('');
 
@@ -193,7 +184,7 @@
 				tag += '				<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
 				tag += '				<div class="fold_tit">\n';
 				tag += '					<span class="prod">[' + item.counselClsfNm + ']</span>\n';
-				tag += '					<span>' + item.questTitle.escapeHtml() + '</span>\n';
+				tag += '					<span>' + item.questTitle + '</span>\n';
 				tag += '				</div>\n';
 				tag += '				<span class="data">' + item.questDt + '</span>\n';
 				tag += '			</div>\n';
@@ -202,7 +193,7 @@
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n'; //문의 내용
 				tag += '			<div>\n';
-				tag += '				<p>' + fnReplaceBr(item.questContent.escapeHtml()) + '</p>\n';
+				tag += '				<p>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</p>\n';
 				
 				if (!gagajf.isNull(item.sysFileNm1) || !gagajf.isNull(item.sysFileNm2)) {
 					tag += '				<p class="img_group">\n';
@@ -233,7 +224,7 @@
 				if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
 					tag += '		<div class="fold_answer">\n'; //문의 답변
 					tag += '			<div class="answer_head">답변이 등록되었습니다.</div>\n';
-					tag += '			<div class="answer_body">' + fnReplaceBr(item.ansContent.escapeHtml()) + '</div>\n';
+					tag += '			<div class="answer_body">' + item.ansContent.replace(/(\r\n)/g, '<br/>') + '</div>\n';
 					tag += '			<span class="data">' + item.ansDt + '</span>\n';
 					tag += '		</div>\n';
 				}

src/main/webapp/WEB-INF/views/web/customer/PrivacyPolicyFormWeb.html

@@ -83,15 +83,16 @@
 		});
 	};
 
+	$(document).on('click','.hook_list ul li a',function(){
+		var hookHeader = $(".gnb").outerHeight() + 50;
+		var hookHref = $(this).attr("href");
+		var hookPot = $(hookHref == "#" || hookHref == "" ? "body" : hookHref);
+		var hookPos = hookPot.offset().top - hookHeader;
+		$("html, body").animate({ scrollTop: hookPos }, 300);
+	});
+
 	// 약관 내부 링크
 	$(function() {
-		$(".hook_list ul li a").on("click", function() {
-			var hookHeader = $(".gnb").outerHeight() + 50;
-			var hookHref = $(this).attr("href");
-			var hookPot = $(hookHref == "#" || hookHref == "" ? "body" : hookHref);
-			var hookPos = hookPot.offset().top - hookHeader;
-			$("html, body").animate({ scrollTop: hookPos }, 300);
-		});
 
 		$(window).scroll(function(){
 			var headerH = $(".header").height();

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

@@ -702,22 +702,42 @@ $(document).ready( function() {
 
 
 	/* SLIDE - MD’S PICK */
-	var br_md_slide = new Swiper('.brand_main .md_item .swiper-container', {
-		navigation: {
-			nextEl: '.md_item .swiper-button-next',
-			prevEl: '.md_item .swiper-button-prev',
-		},
-		loop:true,
-		slidesPerView: 5,
-		slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
-		spaceBetween: 22,
-		speed : 1000,
-		pagination: {
-			el: '.md_item .swiper-pagination',
-			clickable: true,
-		},
-	});
-
+	var mdPickCont = $('.post-pick-nav .swiper-slide');
+	var mdPickLength = mdPickCont.length;
+	if(mdPickLength < 6){
+		var br_md_slide = new Swiper('.brand_main .md_item .swiper-container', {
+			initialSlide: 0,
+			navigation: {
+				nextEl: '.md_item .swiper-button-next',
+				prevEl: '.md_item .swiper-button-prev',
+			},
+			loop: false,
+			slidesPerView: 5,
+			//slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			pagination: {
+				el: '.md_item .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}else{
+		var br_md_slide = new Swiper('.brand_main .md_item .swiper-container', {
+			navigation: {
+				nextEl: '.md_item .swiper-button-next',
+				prevEl: '.md_item .swiper-button-prev',
+			},
+			loop:true,
+			slidesPerView: 5,
+			slidesPerGroup:5, //210429_추가 : slidesPerGroup 추가.
+			spaceBetween: 22,
+			speed : 1000,
+			pagination: {
+				el: '.md_item .swiper-pagination',
+				clickable: true,
+			},
+		});
+	}
 
 	/* SLIDE - SPECIAL SHOP */
 	$('.brand_main .special_shop .spe_pr_list .spe_sl').hide();

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

@@ -195,28 +195,57 @@
 		});
 
 		/* SLIDE - MD ITEMS */
-		var dp_submain_mditem = new Swiper('.dp .md_item .swiper-container', {
-			slidesPerView: 5,
-			slidesPerGroup: 5,
-			spaceBetween: 20,
-			loop: true,
-			watchSlidesProgress: true,
-			watchSlidesVisibility: true,
-			allowTouchMove: false,
-			speed : 1000,
-			// autoplay: {
-			//     delay: 3000,
-			//     disableOnInteraction:false,
-			// },
-			navigation: {
-				nextEl: '.dp .md_item .swiper-button-next',
-				prevEl: '.dp .md_item .swiper-button-prev',
-			},
-			pagination: {
-				el: '.dp .md_item .swiper-pagination',
-				clickable: true,
-			},
-		});
+		var mdPickCont = $('.dp .md_item .swiper-container');
+		var mdPickLength = mdPickCont.length;
+		if(mdPickLength < 6){
+			var dp_submain_mditem = new Swiper('.dp .md_item .swiper-container', {
+				initialSlide: 0,
+				slidesPerView: 5,
+				// slidesPerGroup: 5,
+				spaceBetween: 20,
+				loop: false,
+				watchSlidesProgress: true,
+				watchSlidesVisibility: true,
+				allowTouchMove: false,
+				speed : 1000,
+				// autoplay: {
+				//     delay: 3000,
+				//     disableOnInteraction:false,
+				// },
+				navigation: {
+					nextEl: '.dp .md_item .swiper-button-next',
+					prevEl: '.dp .md_item .swiper-button-prev',
+				},
+				pagination: {
+					el: '.dp .md_item .swiper-pagination',
+					clickable: true,
+				},
+			});
+		}else{
+			var dp_submain_mditem = new Swiper('.dp .md_item .swiper-container', {
+				slidesPerView: 5,
+				slidesPerGroup: 5,
+				spaceBetween: 20,
+				loop: true,
+				watchSlidesProgress: true,
+				watchSlidesVisibility: true,
+				allowTouchMove: false,
+				speed : 1000,
+				// autoplay: {
+				//     delay: 3000,
+				//     disableOnInteraction:false,
+				// },
+				navigation: {
+					nextEl: '.dp .md_item .swiper-button-next',
+					prevEl: '.dp .md_item .swiper-button-prev',
+				},
+				pagination: {
+					el: '.dp .md_item .swiper-pagination',
+					clickable: true,
+				},
+			});
+		}
+
 	});
 
 // 카테고리1Depts 설정

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewFormWeb.html

@@ -332,7 +332,7 @@
 					
 				}
 				html+='						<div class="txt_review_box"  id="admin_'+item.reviewSq+'">\n';
-				html+='							<p>'+item.reviewContent.escapeHtml()+'</p>\n';
+				html+='							<p style="white-space:pre;">'+item.reviewContent.escapeHtml()+'</p>\n';
 				html+='						</div>\n';
 				
 				if (item.admRpl != null && item.admRpl != '') {

src/main/webapp/ux/style24_link.js

@@ -1040,20 +1040,28 @@ function cfnUseTermsLayer() {
 function cfnPrivacyPolicyLayer(mallGb) {
 	let str;
 	if (_frontGb === 'P') {
-		str = '<div class="modal fade policiesPrivacy_pop" id="policiesPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>';
+		str = '<div class="modal fade policiesPrivacy_pop" id="policies_privacypop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>';
 	} else {
-		str = '<div class="modal pop_full fade" id="policiesPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>'
+		str = '<div class="modal pop_full fade" id="policies_privacypop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>'
 	}
-	if ($('#policiesPrivacyPop').length == 0) {
+	if ($('#policies_privacypop').length == 0) {
 		$('body').append(str);
 	} else {
-		$("#policiesPrivacyPop").modal("show");
+		$("#policies_privacypop").modal("show");
 	}
 	let params = {}
 	params.mallGb = mallGb;
-	cfnOpenLayer(_PAGE_PRIVACY_POLICY_LAYER, 'policiesPrivacyPop', params);
+	cfnOpenLayer(_PAGE_PRIVACY_POLICY_LAYER, 'policies_privacypop', params);
 }
 
+/**
+ * @type   : function
+ * @access : public
+ * @desc   : 업체리스트
+ * <pre>
+ *		cfnSupplyComanyLayer();
+ * </pre>
+ */
 function cfnSupplyComanyLayer(mallGb) {
 	let str;
 	if (_frontGb === 'P') {