메인전시 수정

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

@@ -1474,9 +1474,11 @@
 			,DATE_FORMAT(#{dispStdt}, '%Y-%m-%d %H:%i:%S')
 			,DATE_FORMAT(#{dispEddt}, '%Y-%m-%d %H:%i:%S')
 			,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD FROM	TB_CONTENTS_PREVIEW	WHERE CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc}
-			    <if test="brandGroupNo != null and brandGroupNo !=''">
-			        AND BRAND_GROUP_NO = #{brandGroupNo}
-			    </if>
+			        <if test="contentsLoc != null and contentsLoc != '' and contentsLoc != 'SMM007'">
+			            <if test="brandGroupNo != null and brandGroupNo !=''">
+			                AND BRAND_GROUP_NO = #{brandGroupNo}
+			            </if>
+			        </if>
 			    ) TMP)
 			,#{imgPath1}
 			,#{imgPath2}
@@ -1503,7 +1505,7 @@
 			,#{subText3}
 			,#{subText4}
 			,#{html}
-			,#{brandGroupNo}
+			,CASE WHEN #{brandGroupNo} = '' THEN NULL ELSE #{brandGroupNo} END
 			,#{brandGroupImg}
 			,#{mdTitle}
 			,#{useYn}

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

@@ -625,11 +625,11 @@ console.log('brandGroupNo:'+brandGroupNo);
 
 			var dispOrd = $(this).find("[name=dispOrd]").val();
 
-			var brandGroupNo = '';
+			var brandGroupNo;
 			if(contentsLoc=='SBM007'||contentsLoc=='SBM008'||contentsLoc=='SBM009'||contentsLoc=='SBM017'||contentsLoc=='SBM018'||contentsLoc=='SBM019'||contentsLoc=='SOM003'||contentsLoc=='SCM002'||contentsLoc=='SCM003'){
 				brandGroupNo = [[${brandGroupNo}]];
 			}else{
-				$(this).find("[name=brandGroupNo]").val();
+				brandGroupNo = $(this).find("[name=brandGroupNo]").val();
 			}
 			var brandGroupImg = $(this).find("[name=brandNewImgFile]").val();
 			var mdTitle = $(this).find("[name=mdTitle]").val();