浏览代码

메인전시 수정

bin2107 5 年之前
父节点
当前提交
42262805ff

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

@@ -26,6 +26,7 @@ public class CategoryGoods extends TscBaseDomain {
 	private String cate3No;
 	private String cate4No;
 	private String searchGb;
+	private String contentsLoc;
 
 	private int rnum;
 	private String goodsCd;

+ 8 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsaDsiplay.xml

@@ -854,6 +854,9 @@
 									AND CATE4_NO  = #{cate4No}
 								</if>
 				)
+				<if test="contentsLoc != null and contentsLoc !=''">
+					AND A.CONTENTS_LOC = #{contentsLoc}
+				</if>
 		) A
 		<if test="searchGb == null or searchGb =='BASIC'">
 			, TB_GOODS G
@@ -902,11 +905,13 @@
 							, G.SUPPLY_GOODS_CD
 							, G.STYLE_YEAR
 							, FN_GET_CODE_NM('G009',IFNULL(G.FORMAL_GB,'10'))  AS FORMAL_GB
+							, A.CONTENTS_LOC
 						FROM ( SELECT A.GOODS_CD
 									, A.CATE_NO
 									, A.DISP_ORD
 									, A.REG_NO
 									, A.REG_DT
+									, A.CONTENTS_LOC
 								FROM TB_CATE_GOODS A
 								WHERE 1=1
 								AND A.CATE_NO IN ( SELECT LEAF_CATE_NO
@@ -925,6 +930,9 @@
 													AND CATE4_NO  = #{cate4No}
 												</if>
 								)
+								<if test="contentsLoc != null and contentsLoc !=''">
+								AND A.CONTENTS_LOC = #{contentsLoc}
+								</if>
 					) A
 				<if test="searchGb == null or searchGb =='BASIC'">
 					, TB_GOODS G

+ 2 - 0
src/main/webapp/WEB-INF/views/display/GoodsDispOrdChangePopupForm.html

@@ -26,6 +26,7 @@
 			<input type="hidden" id="cate4No" name="cate4No" th:value="${params.cate4No}"/>
 			<input type="hidden" id="searchGb" name="searchGb" value="BASIC"/>
 			<input type="hidden" id="cateCd" name="cateCd" th:value="${params.cateCd}"/>
+			<input type="hidden" id="contentsLoc" name="contentsLoc" th:value="${params.contentsLoc}"/>
 			<button type="button" class="btn btn-base btn-lg" id="btnSearch" style="display: none;">조회</button>
 			<div class="panelTitle">
 				<h2>상품 순서변경</h2>
@@ -298,6 +299,7 @@
 					dispOrdArr : dispOrdArr
 					,goodsCdArr : goodsCdArr
 					,cateNo : $("#goodsDispOrdChangeForm input[name=cateCd]").val()
+					,contentsLoc : $("#goodsDispOrdChangeForm input[name=contentsLoc]").val()
 				}
 
 				var jsonData = JSON.stringify(data);

+ 1 - 0
src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -738,6 +738,7 @@
 		params += '&selLvl='+selLvl;
 		params += '&cateCd='+result.leafCateNo;
 		params += '&goodsAddYn=Y';
+		params += '&contentsLoc='+result.contentsLoc;
 		cfnOpenGoodsDispOrdChangePopup('', params);
 	};