브랜드 상품리스트 수정

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

@@ -665,7 +665,10 @@ public class TsfDisplayController extends TsfBaseController {
 		cate1.setCateGb("G032_101");
 		cate1.setCate1No(params.getCate1No());
 		mav.addObject("cateList", diquest.getCategoryList(cate1));
-
+		if (params.getBrandGroupNo() != null && params.getBrandGroupNo() > 0) {
+			cate1.setCate1No(null);
+			mav.addObject("brandCateList" , diquest.getCategoryList(cate1));
+		}
 		// 상품리스트 카테고리별 필터 목록
 		filterList = diquest.getFilterList(params);
 //		}else{

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

@@ -3500,7 +3500,7 @@
 		          , G.CURR_PRICE         /*현재판매가*/
 		          , G.REG_DT             /*등록일시*/
 		    FROM   (
-		        SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM
+		        SELECT DISTINCT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM
 		               ELSE BG.BRAND_GROUP_KNM  END      AS BRAND_GROUP_NM /*브랜드그룹명*/
 		             , G.GOODS_CD                                               /*상품코드*/
 		             , G.GOODS_NM                                               /*상품명*/
@@ -3516,7 +3516,7 @@
 		             , G.REG_DT                                                 /*등록일시*/
 		        FROM   TB_CATE_4SRCH C4
 		        , TB_CATE_GOODS CG
-		        , TB_GOODS G USE INDEX (IX_GOODS_01)
+		        , TB_GOODS G
 		        , TB_GOODS_STOCK GS
 		        , TB_BRAND B
 		        , TB_BRAND_GROUP BG
@@ -3575,7 +3575,7 @@
 		         , G.CURR_PRICE         /*현재판매가*/
 		         , G.REG_DT             /*등록일시*/
 		    FROM   (
-		        SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM
+		        SELECT DISTINCT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN BG.BRAND_GROUP_ENM
 		               ELSE BG.BRAND_GROUP_KNM  END      AS BRAND_GROUP_NM /*브랜드그룹명*/
 		             , G.GOODS_CD                                               /*상품코드*/
 		             , G.GOODS_NM                                               /*상품명*/

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

@@ -1195,6 +1195,9 @@
 			let allCateList = [[${allCateList}]];
 			let tag = '';
 			let html = '';
+			if(brandGroupNo>0){
+				var brandCateList =  [[${brandCateList}]];
+			}
 
 			if(!gagajf.isNull(cate5No)){
 
@@ -1602,30 +1605,53 @@
 					$("#cateDepth").append(tag);
 				}
 			}else if(!gagajf.isNull(cate1No)){
+				if(brandGroupNo > 0){
+					tag += '<a class="daps1" href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'\')";>전체</a>\n';
+					tag += '<ul class="daps2">\n';
+				}
 				if(formalGb=='G009_20'){
 					tag += '<a class="daps1" href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\''+formalGb+'\')";>전체</a>\n';
 					tag += '<ul class="daps2">\n';
 				}
-				$.each(cateList, function(idx,item){
-					$.each(allCateList, function (allIdx, allItem){
-						if(brandGroupNo > 0){
+
+				if(brandGroupNo > 0){
+					$.each(brandCateList, function(idx,item){
+						$.each(allCateList, function (allIdx, allItem){
 							if(item.cate1No==allItem.cate1No){
 								if(idx<1) {
 									$("#htopTitle").append(fnDisplayTitle(item.cate1Nm));
 								}
-								if(idx<1) {
-									tag += '<li';
-									if(item.cate1No==allItem.cate1No){
-										tag += ' class="on"';
-									}
-									tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item.cate1No + ' ';
-									if(formalGb=='G009_20'){
-										tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
-									}
-									tag += ');">'+item.cate1Nm+'</a></li>';
+								tag += '<li';
+								if(item.cate1No==cate1No){
+									tag += ' class="on"';
+								}
+								tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item.cate1No + ' ';
+								if(formalGb=='G009_20'){
+									tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 								}
+								tag += ');">'+item.cate1Nm+'</a></li>';
 							}
-						}else{
+						});
+						if(item.cate2List != null && item.cate2List.length > 0){
+							let leafTag = '';
+							leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\', \'\' ';
+							if(formalGb=='G009_20'){
+								leafTag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+							}
+							leafTag += ');">전체</a>';
+							$.each(item.cate2List, function (idx, item){
+								leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item.cate1No + ' , ' + item.cate2No + ' ';
+								if(formalGb=='G009_20'){
+									leafTag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+								}
+								leafTag += ');">'+item.cate2Nm+'</a>';
+							});
+							$('#leafCateList').append(leafTag);
+						}
+					});
+				}else{
+					$.each(cateList, function(idx,item){
+						$.each(allCateList, function (allIdx, allItem){
 							if(item.cate1No==allItem.cate1No){
 								if(idx<1) {
 									$("#htopTitle").append(fnDisplayTitle(item.cate1Nm));
@@ -1642,32 +1668,46 @@
 								}
 								tag += ');">'+allItem.cate1Nm+'</a></li>';
 							}
-						}
-					});
+						});
 
-					if(item.cate2List != null && item.cate2List.length > 0){
-						let leafTag = '';
-						leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\', \'\' ';
-						if(formalGb=='G009_20'){
-							leafTag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
-						}
-						leafTag += ');">전체</a>';
-						$.each(item.cate2List, function (idx, item){
-							leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item.cate1No + ' , ' + item.cate2No + ' ';
+						if(item.cate2List != null && item.cate2List.length > 0){
+							let leafTag = '';
+							leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\', \'\' ';
 							if(formalGb=='G009_20'){
-								leafTag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+								leafTag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 							}
-							leafTag += ');">'+item.cate2Nm+'</a>';
-						});
-						$('#leafCateList').append(leafTag);
-					}
-				});
+							leafTag += ');">전체</a>';
+							$.each(item.cate2List, function (idx, item){
+								leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item.cate1No + ' , ' + item.cate2No + ' ';
+								if(formalGb=='G009_20'){
+									leafTag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+								}
+								leafTag += ');">'+item.cate2Nm+'</a>';
+							});
+							$('#leafCateList').append(leafTag);
+						}
+					});
+				}
+
 				if(formalGb=='G009_20'){
 					tag += '</ul>\n';
 				}
 				$("#cateDepth").append(tag);
 			}else{
 				let tag = '';
+				if(brandGroupNo > 0 ){
+					$("#htopTitle").text('전체');
+					tag += '<ul class="daps2">\n';
+					tag += '<li>';
+					tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\'';
+					if(formalGb=='G009_20'){
+						tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+					}
+					tag += ' )">전체</a>';
+					tag += '</li>\n';
+					tag += '</ul>\n';
+					$("#cateDepth").append(tag);
+				}
 				if(formalGb == 'G009_20'){
 					$("#htopTitle").text('아울렛');
 					tag += '<ul class="daps2">\n';

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

@@ -471,29 +471,40 @@ console.log(allCateList);
 			if(brandGroupNo>0){
 				$("#brandNm").show();
 				$("#brandNm").text(brandGroupNm);
+				var brandCateList =  [[${brandCateList}]];
 			}
 
 			if(cateList.length > 0){
 				if(gagajf.isNull(cate1No) && gagajf.isNull(cate2No) && gagajf.isNull(cate3No) && gagajf.isNull(cate4No) && gagajf.isNull(cate5No) && formalGb == 'G009_20'){
-					let html = '<li><a class="on" href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'' + formalGb + '\');">전체</a></li>';
-					$('#ulAllCate').append(html);
 					$('#navNm').show();
 					$('#navNm').text('아울렛');
 					$('#formTitle').text('아울렛');
+				}if(gagajf.isNull(cate1No) && gagajf.isNull(cate2No) && gagajf.isNull(cate3No) && gagajf.isNull(cate4No) && gagajf.isNull(cate5No) && brandGroupNo > 0){
+					let html = '<li><a class="on" href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'\');">전체</a></li>';
+					$('#ulAllCate').append(html);
+					$('#navNm').show();
+					$('#navNm').text('전체');
+					$('#formTitle').text('전체');
 				}else if(formalGb == 'G009_20'){
-					let html = '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'' + formalGb + '\');">전체</a></li>';
+					let html = '<li><a';
+					if(gagajf.isNull(cate1No) && gagajf.isNull(cate2No) && gagajf.isNull(cate3No) && gagajf.isNull(cate4No) && gagajf.isNull(cate5No)){
+						html += ' class="on"';
+					}
+					html += ' href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'' + formalGb + '\');">전체</a></li>';
 					$('#ulAllCate').append(html);
 				}
 
-				$.each(cateList,function (idx,item){
-					$.each(allCateList, function (allIdx, allItem){
-						if(brandGroupNo > 0){
+				if(brandGroupNo > 0){
+					$.each(brandCateList,function (idx,item){
+						$.each(allCateList, function (allIdx, allItem){
 							if(allItem.cate1No==item.cate1No){
-								if(idx<1){
-									$('#ulAllCate').append(fnCreateSearchEngineCategoryList(item));
-								}
+								$('#ulAllCate').append(fnCreateSearchEngineCategoryList(item));
 							}
-						}else{
+						});
+					});
+				}else{
+					$.each(cateList,function (idx,item){
+						$.each(allCateList, function (allIdx, allItem){
 							if(allItem.cate1No==item.cate1No){
 								if(idx<1){
 									$('#ulAllCate').append(fnCreateSearchEngineCategoryList(item));
@@ -509,14 +520,14 @@ console.log(allCateList);
 									$('#ulAllCate').append(html);
 								}
 							}
-						}
+						});
 					});
-				});
-
+				}
 			}
 		}
 
 		var fnCreateSearchEngineCategoryList = function (cate1){
+			console.log('000');
 			var brandGroupNo = [[${cateInfo.brandGroupNo}]];
 			var cateGb =  [[${cateInfo.cateGb}]];
 			var formalGb = [[${cateInfo.formalGb}]];

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

@@ -29,14 +29,18 @@
 	</div>
 
 	<div class="wrap">
+		<div class="content">
+			<!-- 210623_ 수정 : 페이지 타이틀 분리 -->
+			<div class="cont_head">
+				<div>
+					<h3 class="cate1Nm"></h3>
+				</div>
+			</div>
+		</div>
+
 		<th:block th:if="${cateMainLayoutList}" th:each="mainLayoutData, mainStat : ${cateMainLayoutList}" th:with="contentsLoc=${#strings.replace(mainLayoutData.contentsLoc,'SCM','')},contentsTitle=${mainLayoutData.contentsTitle}">
 			<th:block th:if="${contentsLoc=='001'}">
 				<div class="content dp_submain" > <!-- 페이지특정 클래스 = dp_list -->
-					<div class="cont_head">
-						<div>
-							<h3 class="cate1Nm"></h3>
-						</div>
-					</div>
 					<div class="cont_body" th:if="${planningList != null and !planningList.empty}">
 						<div class="dp_sum_slide dp_inner">
 							<div class="swiper-container">