전시 수정

src/main/java/com/style24/admin/biz/web/TsaDisplayController.java

@@ -482,7 +482,7 @@ public class TsaDisplayController extends TsaBaseController {
 		categoryGoods.setRegNo(TsaSession.getInfo().getUserNo());	//엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
 		categoryGoods.setPageable(new TscPageRequest(categoryGoods.getPageNo() - 1, categoryGoods.getPageSize()));
 		categoryGoods.getPageable().setTotalCount(displayService.getCategoryGoodsListCount(categoryGoods));
-
+		categoryGoods.setDispUseGb("Y");
 		result.set("pageing", categoryGoods);
 		result.set("categoryGoodsList", displayService.getCategoryGoodsList(categoryGoods));
 

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

@@ -71,6 +71,8 @@ public class CategoryGoods extends TscBaseDomain {
 	private String brandGrpNm;
 	private String regNm;
 
+	private String dispUseGb;
+
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

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

@@ -1099,7 +1099,9 @@
 					<if test="goodsCd != null and goodsCd !='' and searchGb !='EXCEL'">
 						AND G.GOODS_CD = #{goodsCd}
 					</if>
-					ORDER BY A.DISP_ORD ASC, G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC
+					<if test='dispUseGb != null and dispUseGb != "" and dispUseGb == "Y"'>
+						ORDER BY A.DISP_ORD ASC, G.UPD_DT DESC, G.CURR_PRICE DESC, G.GOODS_CD ASC
+					</if>
 			<include refid="getListPagingCondition_sql"/>
 	</select>
 

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -102,7 +102,7 @@
 		<ul class="panelBar">
 			<li class="aR" id="btnGoodsEdit" style="display:none">
 				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnAddGoods" style="display:none">상품추가</button>
-				<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>
+<!--				<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>-->
 				<!--<button type="button" class="btn btn-primary btn-lg" id="btnSelectTop">선택최상위로</button>-->
 				<button type="button" class="btn btn-danger btn-lg" id="btnSelectDel">선택삭제</button>
 			</li>

src/main/webapp/WEB-INF/views/display/LookbookBannerPopupForm.html

@@ -188,6 +188,10 @@
 
 	var fnBannerImgFileUpload = function (obj, idx){
 		var file = obj.files[0];
+		// 파일 용량 체크 10MB
+		if(!gagajf.checkFileSize(file)){
+			return;
+		}
 		file.name = 'test';
 		if (typeof(file) == 'undefined'){
 			return;