jmh 4 лет назад
Родитель
Сommit
2657c5684d

+ 1 - 0
src/main/java/com/style24/persistence/domain/BrandGroup.java

@@ -32,4 +32,5 @@ public class BrandGroup extends TscBaseDomain {
 	private String dispNmLang;
 	
 	private String cateGb;
+	private String supplyCompCd;	// 공급업체코드
 }

+ 5 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml

@@ -84,7 +84,11 @@
 		     , DEFAULT_CATE_YN
 		     , CASE WHEN DEFAULT_CATE_YN = 'Y' THEN (SELECT CD FROM TB_COMMON_CODE WHERE 1=1 AND CD_NM = 'BY ITEM')
 		            ELSE (SELECT CD FROM TB_COMMON_CODE WHERE 1=1 AND CD_NM = 'BY BRAND') END AS CATE_GB
-		FROM   TB_BRAND_GROUP
+		     , IFNULL((SELECT MAX(SS.SUPPLY_COMP_CD) 
+					FROM TB_BRAND SB INNER JOIN TB_BRAND_SUPPLY SS ON SB.BRAND_CD = SS.BRAND_CD 
+					WHERE SB.BRAND_GROUP_NO = A.BRAND_GROUP_NO
+			   ), '') AS SUPPLY_COMP_CD
+		FROM   TB_BRAND_GROUP A
 		WHERE  BRAND_GROUP_NO = #{brandGroupNo}
 		AND    USE_YN = 'Y'
 	</select>

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

@@ -81,7 +81,8 @@
 										<input id="unisex" type="checkbox" onclick="fnResetListIdx();fnFilterOption(this,'on');"><label for="unisex"> <span>남여 공용만 보기</span> </label>
 									</div>
 									<div th:unless="${cateInfo.formalGb=='G009_20'}">
-										<input id="newGoods" type="checkbox" onclick="fnResetListIdx();fnFilterOption(this,'off');" checked="checked"><label for="newGoods"> <span>신상품만 보기</span> </label>
+										<input id="newGoods" type="checkbox" onclick="fnResetListIdx();fnFilterOption(this,'off');" th:checked="${brandGroupInfo == null or brandGroupInfo.supplyCompCd != '3'}">
+										<label for="newGoods"> <span>신상품만 보기</span> </label>
 									</div>
 								</div>
 							</div>
@@ -294,7 +295,7 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-		<input type="hidden" name="newGoods" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
+		<input type="hidden" name="newGoods" th:unless="${(brandGroupInfo != null and brandGroupInfo.supplyCompCd == '3') or (cateInfo.formalGb=='G009_20')}" th:value="${(brandGroupInfo != null and brandGroupInfo.supplyCompCd == '3') or (cateInfo.formalGb=='G009_20') ?'':'40'}" />
 		<input type="hidden" name="keyword" value=""/>
 <!--		<input type="hidden" name="benefitArr" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>-->
 	</form>