브랜드 메인전시 수정

src/main/java/com/style24/admin/biz/dao/TsaDisplayDao.java

@@ -352,7 +352,7 @@ public interface TsaDisplayDao {
 	 * @author bin2107
 	 * @since 2021. 2. 23
 	 */
-	String getContentsTitle(String cateNo, String contentsLoc);
+	String getContentsTitle(String cateNo, String contentsLoc, String brandGroupNo);
 
 	/**
 	 * 메인전시 컨텐츠 타이틀 변경

src/main/java/com/style24/admin/biz/service/TsaDisplayService.java

@@ -578,6 +578,7 @@ public class TsaDisplayService {
 				Contents contentsTmp = new Contents();
 				contentsTmp.setCateNo(contents.getCateNo());
 				contentsTmp.setContentsLoc(contents.getContentsLoc());
+				contentsTmp.setBrandGroupNo(contents.getBrandGroupNo());
 				contentsTmp.setContentsTitle(contents.getContentsTitle());
 				contentsTmp.setRegNo(TsaSession.getInfo().getUserNo());
 				displayDao.deleteContentsTitle(contentsTmp);
@@ -726,8 +727,8 @@ public class TsaDisplayService {
 	 * @author bin2107
 	 * @since 2021. 2. 22
 	 */
-	public String getContentsTitle(String cateNo, String contentsLoc) {
-		return displayDao.getContentsTitle(cateNo,contentsLoc);
+	public String getContentsTitle(String cateNo, String contentsLoc, String brandGroupNo) {
+		return displayDao.getContentsTitle(cateNo,contentsLoc,brandGroupNo);
 	}
 
 	/**

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

@@ -562,13 +562,14 @@ public class TsaDisplayController extends TsaBaseController {
 	 * @since 2021. 2. 22
 	 */
 	@GetMapping("/main/contents/popup/form")
-	public ModelAndView mainContentsPopupForm(@RequestParam(value = "cateNo") String cateNo, @RequestParam(value = "contentsLoc") String contentsLoc) {
+	public ModelAndView mainContentsPopupForm(@RequestParam(value = "cateNo") String cateNo, @RequestParam(value = "contentsLoc") String contentsLoc , @RequestParam(value = "brandGroupNo", required = false) String brandGroupNo) {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("cateNo", cateNo);
 		mav.addObject("contentsLoc", contentsLoc);
+		mav.addObject("brandGroupNo", brandGroupNo);
 		mav.addObject("contentsDesc", displayService.getContentsDesc(contentsLoc));
 		mav.addObject("contentsLocList", rendererService.getAvailCommonCodeList("G028"));
-		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc));
+		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc,brandGroupNo));
 
 		mav.setViewName("display/MainContentsPopupForm");
 		return mav;
@@ -685,13 +686,13 @@ public class TsaDisplayController extends TsaBaseController {
 	 * @since 2021. 2. 24
 	 */
 	@GetMapping("/main/multicontents/popup/form")
-	public ModelAndView mainMultiContentsPopupForm(@RequestParam(value = "cateNo") String cateNo, @RequestParam(value = "contentsLoc") String contentsLoc) {
+	public ModelAndView mainMultiContentsPopupForm(@RequestParam(value = "cateNo") String cateNo, @RequestParam(value = "contentsLoc") String contentsLoc, @RequestParam(value = "brandGroupNo", required = false) String brandGroupNo) {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("cateNo", cateNo);
 		mav.addObject("contentsLoc", contentsLoc);
 		mav.addObject("contentsDesc", displayService.getContentsDesc(contentsLoc));
 		mav.addObject("contentsLocList", rendererService.getAvailCommonCodeList("G028"));
-		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc));
+		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc,brandGroupNo));
 		mav.setViewName("display/MainMultiContentsPopupForm");
 		return mav;
 	}
@@ -925,13 +926,14 @@ public class TsaDisplayController extends TsaBaseController {
 	 * @since 2021. 3. 10
 	 */
 	@GetMapping("/main/gnbcontents/popup/form")
-	public ModelAndView mainGnbContentsPopupForm(@RequestParam(value = "cateNo") String cateNo, @RequestParam(value = "contentsLoc") String contentsLoc) {
+	public ModelAndView mainGnbContentsPopupForm(@RequestParam(value = "cateNo") String cateNo, @RequestParam(value = "contentsLoc") String contentsLoc, @RequestParam(value = "brandGroupNo", required = false) String brandGroupNo) {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("cateNo", cateNo);
 		mav.addObject("contentsLoc", contentsLoc);
+		mav.addObject("brandGroupNo", brandGroupNo);
 		mav.addObject("contentsDesc", displayService.getContentsDesc(contentsLoc));
 		mav.addObject("contentsLocList", rendererService.getAvailCommonCodeList("G028"));
-		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc));
+		mav.addObject("contentsTitle", displayService.getContentsTitle(cateNo,contentsLoc,brandGroupNo));
 		mav.addObject("cate1List", rendererService.getCate1List());
 
 		mav.setViewName("display/MainGnbContentsPopupForm");

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

@@ -12,6 +12,7 @@ import java.util.List;
 public class MainDisplay extends TscBaseDomain {
     private Integer cateNo;
     private String contentsLoc;
+    private String brandGroupNo;	// 브랜드그룹코드
     private Integer dispOrd;
     private String contentsYn;
     private Integer colCnt;

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

@@ -1213,6 +1213,7 @@
 		/* TsaDisplay.getMainLayoutList */
 		SELECT	CATE_NO
 				,CONTENTS_LOC
+		     	,BRAND_GROUP_NO
 				,DISP_ORD
 				,CONTENTS_YN
 				,COL_CNT
@@ -1221,6 +1222,16 @@
 				,SYS_FILE_NM
 		FROM	TB_MAIN_LAYOUT
 		WHERE	CATE_NO = #{cateNo}
+		<if test='cateNo == "1711" or cateNo == "1721"'>
+			<choose>
+				<when test='brandGroupNo != null and brandGroupNo != ""'>
+					AND BRAND_GROUP_NO = #{brandGroupNo}
+				</when>
+		  		<otherwise>
+					AND BRAND_GROUP_NO = '0'
+				</otherwise>
+			</choose>
+		</if>
 		ORDER BY DISP_ORD, COL_NO
 	</select>
 
@@ -1229,6 +1240,9 @@
 		/* TsaDisplay.deleteMainLayout */
 		DELETE FROM TB_MAIN_LAYOUT
 		WHERE CATE_NO = #{cateNo}
+		<if test='brandGroupNo!=null and brandGroupNo!=""'>
+			AND 	BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 		<if test='contentsLoc!=null and contentsLoc!=""'>
 			AND SUBSTR(CONTENTS_LOC, 0, 4) = SUBSTR(#{contentsLoc}, 0, 4)
 		</if>
@@ -1241,6 +1255,7 @@
 		(
 			CATE_NO
 			,CONTENTS_LOC
+			,BRAND_GROUP_NO
 			,DISP_ORD
 			,CONTENTS_YN
 			,COL_CNT
@@ -1256,6 +1271,7 @@
 		(
 		 	#{cateNo}
 		 	,#{contentsLoc}
+		 	,#{brandGroupNo}
 		 	,#{dispOrd}
 			,#{contentsYn}
 			,#{colCnt}
@@ -1343,6 +1359,11 @@
 		FROM TB_CONTENTS_PREVIEW A
 		WHERE A.CATE_NO = #{cateNo}
 		  AND A.CONTENTS_LOC = #{contentsLoc}
+		<if test='cateNo == "1711" or cateNo == "1721"'>
+			<if test='brandGroupNo != null and brandGroupNo != ""'>
+				AND A.BRAND_GROUP_NO = #{brandGroupNo}
+		  	</if>
+		</if>
 		<if test='contentsLoc != null and contentsLoc != ""'>
 		  <if test='contentsLoc != "SCM002" and contentsLoc != "SCM003"'>
 			  AND A.USE_YN = 'Y'
@@ -1357,6 +1378,9 @@
 		DELETE FROM TB_CONTENTS_PREVIEW
 		WHERE 	CATE_NO = #{cateNo}
 		AND 	CONTENTS_LOC = #{contentsLoc}
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+			AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 	</delete>
 
 	<!-- 메인전시 컨텐츠 미리보기 저장 -->
@@ -1454,6 +1478,9 @@
 		DELETE FROM TB_CONTENTS
 		WHERE 	CATE_NO = #{cateNo}
 		  AND 	CONTENTS_LOC = #{contentsLoc}
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+			AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 	</delete>
 
 	<!-- 메인전시 컨텐츠 저장 -->
@@ -1545,6 +1572,9 @@
 		FROM	TB_CONTENTS_PREVIEW
 		WHERE	CONTENTS_LOC = #{contentsLoc}
 		AND 	CATE_NO = #{cateNo}
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+			AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 	</insert>
 
 	<!-- 메인전시 컨텐츠 타이틀 임시테이블 삭제 -->
@@ -1553,6 +1583,9 @@
 		DELETE FROM TMP_MAIN_LAYOUT_TITLE
 		WHERE 	CATE_NO = #{cateNo}
 		  AND 	CONTENTS_LOC = #{contentsLoc}
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+			AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 	</delete>
 
 	<!-- 메인전시 컨텐츠 타이틀 임시테이블 저장 -->
@@ -1562,6 +1595,7 @@
 		(
 			CATE_NO
 			,CONTENTS_LOC
+			,BRAND_GROUP_NO
 			,CONTENTS_TITLE
 			,REG_NO
 			,REG_DT
@@ -1570,6 +1604,7 @@
 		(
 		 	#{cateNo}
 		 	,#{contentsLoc}
+		 	,#{brandGroupNo}
 			,#{contentsTitle}
 			,#{regNo}
 			,NOW()
@@ -1583,15 +1618,21 @@
 		FROM	TMP_MAIN_LAYOUT_TITLE
 		WHERE	CATE_NO = #{cateNo}
 		AND		CONTENTS_LOC = #{contentsLoc}
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+			AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 	</select>
 
 	<!-- 메인전시 컨텐츠 타이틀 변경 -->
 	<update id="updateContentsTitle" parameterType="Contents">
 		/* TsaDisplay.updateContentsTitle */
 		UPDATE	TB_MAIN_LAYOUT
-		SET CONTENTS_TITLE = (SELECT CONTENTS_TITLE FROM TMP_MAIN_LAYOUT_TITLE WHERE CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc})
+		SET CONTENTS_TITLE = (SELECT CONTENTS_TITLE FROM TMP_MAIN_LAYOUT_TITLE WHERE CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc} AND BRAND_GROUP_NO = #{brandGroupNo})
 		WHERE CATE_NO = #{cateNo}
 		AND CONTENTS_LOC = #{contentsLoc}
+		<if test="brandGroupNo != null and brandGroupNo !=''">
+			AND BRAND_GROUP_NO = #{brandGroupNo}
+		</if>
 	</update>
 
 	<!-- CATEGORY4SRCH 조회 -->
@@ -1779,6 +1820,11 @@
 		/* TsaDisplay.deleteGnbTabPreview */
 		DELETE FROM  TB_GNB_TAB_PREVIEW
 		WHERE 	GTAB_GB = #{gtabGb}
+		<if test='gtabGb != null and gtabGb !="" and gtabGb=="B"'>
+			<if test='brandGroupNo != null and brandGroupNo !=""'>
+				AND	BRAND_GROUP_NO = #{brandGroupNo}
+			</if>
+		</if>
 	</delete>
 
 	<!-- 메인전시 GnbTab 미리보기 저장 -->
@@ -1837,6 +1883,11 @@
 				, DISP_ORD
 		FROM 	TB_GNB_TAB_PREVIEW
 		WHERE	GTAB_GB = #{gtabGb}
+		  <if test='gtabGb != null and gtabGb !="" and gtabGb=="B"'>
+			  <if test='brandGroupNo != null and brandGroupNo !=""'>
+				  AND	BRAND_GROUP_NO = #{brandGroupNo}
+			  </if>
+		  </if>
 		  AND    DISP_STDT <![CDATA[<=]]> NOW()
 		  AND    DISP_EDDT <![CDATA[>=]]> NOW()
 		;
@@ -1847,6 +1898,11 @@
 		/* TsaDisplay.deleteGnbTabContents */
 		DELETE FROM TB_GNB_TAB
 		WHERE 	GTAB_GB = #{gtabGb}
+		<if test='gtabGb != null and gtabGb !="" and gtabGb=="B"'>
+			<if test='brandGroupNo != null and brandGroupNo !=""'>
+				AND	BRAND_GROUP_NO = #{brandGroupNo}
+			</if>
+		</if>
 	</delete>
 
 	<!-- 메인전시 컨텐츠 카테고리 탭영역 저장 -->
@@ -1891,5 +1947,10 @@
 			, NOW()
 		FROM	TB_GNB_TAB_PREVIEW
 		WHERE	GTAB_GB = #{gtabGb}
+		<if test='gtabGb != null and gtabGb !="" and gtabGb=="B"'>
+			<if test='brandGroupNo != null and brandGroupNo !=""'>
+				AND	BRAND_GROUP_NO = #{brandGroupNo}
+			</if>
+		</if>
 	</insert>
 </mapper>

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

@@ -55,6 +55,7 @@
 	/*<![CDATA[*/
 	var cateNo = [[${cateNo}]];
 	var contentsLoc = [[${contentsLoc}]];
+	var brandGroupNo = [[${brandGroupNo}]];
 	var contentsTitle = [[${contentsTitle}]];
 	var contentsLocArr = gagajf.convertToArray([[${contentsLocList}]]);
 	var tdWidth = $("#sortable").find("td").width();
@@ -68,6 +69,7 @@
 		$("#popSortable").html('');
 		var data = {cateNo : cateNo
 			,contentsLoc : contentsLoc
+			,brandGroupNo : brandGroupNo
 		};
 		var jsonData = JSON.stringify(data);
 		gagajf.ajaxJsonSubmit('/display/contents/preview/list', jsonData, fnCreatePopLayout);
@@ -726,6 +728,7 @@
 				, subText4 : subText4
 				, useYn : useYn
 				, dispOrd : dispOrd
+				, brandGroupNo : brandGroupNo
 			};
 
 			dataArr.push(data);
@@ -734,6 +737,7 @@
 		if(dataArr.length==0){
 			var data = {cateNo : cateNo
 				, contentsLoc : contentsLoc
+				, brandGroupNo : brandGroupNo
 			};
 			dataArr.push(data);
 		}else{
@@ -779,6 +783,7 @@
 				cateNo : cateNo
 				, contentsLoc : contentsLoc
 				, contentsTitle : $("#contentsTitleForm input[name=contentsTitle]").val()
+				, brandGroupNo : brandGroupNo
 			}
 			dataArr.push(data);
 		}

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

@@ -40,6 +40,7 @@
 /*<![CDATA[*/
 	var cateNo = [[${cateNo}]];
 	var contentsLoc = [[${contentsLoc}]];
+	var brandGroupNo = [[${brandGroupNo}]];
 	var contentsTitle = [[${contentsTitle}]];
 	var contentsLocArr = gagajf.convertToArray([[${contentsLocList}]]);
 	var tdWidth = $("#gnbTabList").find("td").width();
@@ -98,6 +99,13 @@
 			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="L" onclick="fnChangeCateType(this,'+addIdx+');"/>이벤트링크</label>';
 			html += '	</td>';
 			html += '</tr>';
+		}else if(contentsLoc=='SBM002'){
+			html += '<tr class="cateTypeTr">';
+			html += '	<th>유형선택</th>';
+			html += '	<td colspan="3">';
+			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="L" checked="checked"/>이벤트링크</label>';
+			html += '	</td>';
+			html += '</tr>';
 		}
 		html += '	<tr>';
 		html += '		<th>전시일시</th>';
@@ -136,6 +144,15 @@
 				html += '		</td>';
 				html += '	</tr>';
 			}
+		}else if(contentsLoc=='SBM002'){
+			html += '	<tr name="tabLinkTitleRow">';
+			html += '		<th>타이틀</th>';
+			html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value=""/></td>';
+			html += '	</tr>';
+			html += '	<tr name="tabLinkRow">';
+			html += '		<th>링크 (없으면 #)</th>';
+			html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value=""/></td>';
+			html += '	</tr>';
 		}else{
 			html += '	<tr name="tabCateRow" style="display:none;">';
 			html += '		<th>카테고리</th>';
@@ -369,6 +386,7 @@
 					, cate1No : cate1No
 					, linkUrl : linkUrl
 					, useYn : 'Y'
+					, brandGroupNo : brandGroupNo
 				}
 				dataArr.push(data);
 			}
@@ -558,6 +576,7 @@
 		$("#gnbTabList").html('');
 		var data = {
 			gtabGb : gtabGb
+			,brandGroupNo : brandGroupNo
 		};
 		var jsonData = JSON.stringify(data);
 		gagajf.ajaxJsonSubmit('/display/contents/gnbtab/category/preview/list', jsonData, fnCreateCategoryLayout);
@@ -580,20 +599,26 @@
 			html += '		<tr class="cateTypeTr">';
 			html += '			<th>유형선택</th>';
 			html += '			<td colspan="3">';
-			if(result[i].contentsType=='C'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>대카테고리</label>';
-			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');"/>대카테고리</label>';
-			}
-			if(result[i].contentsType=='O'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="O" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>아울렛</label>';
-			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="O" onclick="fnChangeCateType(this,'+i+');"/>아울렛</label>';
-			}
-			if(result[i].contentsType=='L'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>이벤트링크</label>';
+			if(result[i].brandGroupNo!='' && result[i].brandGroupNo!=null){
+				if(result[i].contentsType=='L'){
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" checked="checked"/>이벤트링크</label>';
+				}
 			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeCateType(this,'+i+');"/>이벤트링크</label>';
+				if(result[i].contentsType=='C'){
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>대카테고리</label>';
+				}else{
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');"/>대카테고리</label>';
+				}
+				if(result[i].contentsType=='O'){
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="O" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>아울렛</label>';
+				}else{
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="O" onclick="fnChangeCateType(this,'+i+');"/>아울렛</label>';
+				}
+				if(result[i].contentsType=='L'){
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>이벤트링크</label>';
+				}else{
+					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeCateType(this,'+i+');"/>이벤트링크</label>';
+				}
 			}
 			html += '			</td>';
 			html += '		</tr>';

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

@@ -179,20 +179,36 @@
 			}else{
 				$("#viewUl").removeClass("off");
 				var cateNo = "";
+				var brandGroupNo = "";
 				var cate1Val = $("#searchForm select[name=cate1No] option:selected").val().split(',')[0];		//1700,Y
-				if((!gagajf.isNull(cate1Val)&&cate1Val=='1711') || (!gagajf.isNull(cate1Val)&&cate1Val=='1721')){
+				/*if((!gagajf.isNull(cate1Val)&&cate1Val=='1711') || (!gagajf.isNull(cate1Val)&&cate1Val=='1721')){
 					cateNo = $("#searchForm").find("td[name=cate2Search]").find("input[name=brandGroupNo]").val();
 				}else{
 					cateNo = val.split(',')[0];
 					if(!gagajf.isNull($("#searchForm select[name=cate2No]").val())){
 						cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
 					}
+				}*/
+				cateNo = val.split(',')[0];
+				if(!gagajf.isNull($("#searchForm select[name=cate2No]").val())){
+					cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
 				}
-
-				console.log('cateNo::'+cateNo);
+				if((!gagajf.isNull(cate1Val)&&cate1Val=='1711') || (!gagajf.isNull(cate1Val)&&cate1Val=='1721')){
+					brandGroupNo = $("#searchForm").find("td[name=cate2Search]").find("input[name=brandGroupNo]").val();
+				}
+				/*else{
+					var data = {
+						cateNo : cateNo
+					};
+				}*/
 				var data = {
 					cateNo : cateNo
+					, brandGroupNo : brandGroupNo
 				};
+
+				console.log('cateNo::'+cateNo);
+				console.log('brandGroupNo::'+brandGroupNo);
+
 				var jsonData = JSON.stringify(data);
 				// 레이아웃 조회 로직
 				gagajf.ajaxJsonSubmit('/display/main/layout/list', jsonData, fnLayoutCallBack);
@@ -520,17 +536,20 @@
 		}
 		var cateNo = '';
 		var cateNm = '';
+		var brandGroupNo = '';
 		if(val.split(',')[1]=='Y'){
 			cateNo = val.split(',')[0];
-			if(cateNo == '1711' || cateNo == '1721'){
-				if(!fnCate2BrandCheck()){
-					return false;
-				}
-				cateNo = $("#searchForm").find("td[name=cate2Search]").find("input[name=brandGroupNo]").val();
-			}
 		}else{
 			cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
 		}
+
+		if(cateNo == '1711' || cateNo == '1721'){
+			if(!fnCate2BrandCheck()){
+				return false;
+			}
+			brandGroupNo = $("#searchForm").find("td[name=cate2Search]").find("input[name=brandGroupNo]").val();
+		}
+
 		var dataArr = [];
 		var contentLocArr = [];
 		var contentLocCheck = true;
@@ -570,6 +589,7 @@
 						, orgFileNm : orgFileNm
 						, sysFileNm : sysFileNm
 						, newSysFileNm : newSysFileNm
+						, brandGroupNo : brandGroupNo
 					};
 					dataArr.push(data);
 				}
@@ -604,24 +624,25 @@
 	var fnChangeContents = function (obj){
 		var val = $("#searchForm select[name=cate1No]").val();
 		var cateNo = '';
+		var brandGroupNo = '';
 		if(val.split(',')[1]=='Y'){
 			cateNo = val.split(',')[0];
 		}else{
 			cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
 		}
 		if(cateNo=='1711' || cateNo=='1721'){
-			cateNo = $("#searchForm").find("input[name=brandGroupNo]").val();
+			brandGroupNo = $("#searchForm").find("input[name=brandGroupNo]").val();
 		}
 
 		var contentsLoc = $(obj).closest("td").find('input:hidden[name="contentsLoc"]').val();
 
 		// 브랜드픽, MD추천 다른 팝업 사용
 		if(contentsLoc=='SMM007'||contentsLoc=='SMM009'){
-			cfnOpenMainMultiContentsPopup(cateNo, contentsLoc);
+			cfnOpenMainMultiContentsPopup(cateNo, contentsLoc, brandGroupNo);
 		}else if(contentsLoc=='STAB001' || contentsLoc=='STAB002' || contentsLoc=='SBM002'){
-			cfnOpenMainGnbContentsPopup(cateNo, contentsLoc);
+			cfnOpenMainGnbContentsPopup(cateNo, contentsLoc, brandGroupNo);
 		}else{
-			cfnOpenMainContentsPopup(cateNo, contentsLoc);
+			cfnOpenMainContentsPopup(cateNo, contentsLoc, brandGroupNo);
 		}
 	}
 
@@ -655,22 +676,45 @@
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function(){
-				if(contentsLoc=='STAB002'){
+				if(contentsLoc=='STAB002') {
 					var data = {
-						gtabGb : 'C'
+						gtabGb: 'C'
+					};
+					var jsonData = JSON.stringify(data);
+					gagajf.ajaxJsonSubmit('/display/contents/gnbtab/save', jsonData);
+				}else if(contentsLoc=='SBM002'){
+					var val = $("#searchForm select[name=cate1No]").val();
+					var cateNo = '';
+					var brandGroupNo = '';
+					if(val.split(',')[1]=='Y'){
+						cateNo = val.split(',')[0];
+					}else{
+						cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
+					}
+					if(cateNo=='1711' || cateNo=='1721'){
+						brandGroupNo = $("#searchForm").find("input[name=brandGroupNo]").val();
+					}
+					var data = {
+						gtabGb: 'B'
+						,brandGroupNo : brandGroupNo
 					};
 					var jsonData = JSON.stringify(data);
 					gagajf.ajaxJsonSubmit('/display/contents/gnbtab/save', jsonData);
 				}else{
 					var val = $("#searchForm select[name=cate1No]").val();
 					var cateNo = '';
+					var brandGroupNo = '';
 					if(val.split(',')[1]=='Y'){
 						cateNo = val.split(',')[0];
 					}else{
 						cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
 					}
+					if(cateNo=='1711' || cateNo=='1721'){
+						brandGroupNo = $("#searchForm").find("input[name=brandGroupNo]").val();
+					}
 					var data = { contentsLocArr : [contentsLoc]
 						,cateNo : cateNo
+						,brandGroupNo : brandGroupNo
 					};
 					var jsonData = JSON.stringify(data);
 					gagajf.ajaxJsonSubmit('/display/contents/save', jsonData);
@@ -689,11 +733,15 @@
 			sureBtnClick: function(){
 				var val = $("#searchForm select[name=cate1No]").val();
 				var cateNo = '';
+				var brandGroupNo = '';
 				if(val.split(',')[1]=='Y'){
 					cateNo = val.split(',')[0];
 				}else{
 					cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
 				}
+				if(cateNo=='1711' || cateNo=='1721'){
+					brandGroupNo = $("#searchForm").find("input[name=brandGroupNo]").val();
+				}
 				var contentsLocArr = [];
 				$("input:hidden[name=contentsLoc]").each(function(){
 					contentsLocArr.push($(this).val());
@@ -701,6 +749,7 @@
 
 				var data = { contentsLocArr : contentsLocArr
 					,cateNo : cateNo
+					,brandGroupNo : brandGroupNo
 				};
 				var jsonData = JSON.stringify(data);
 				gagajf.ajaxJsonSubmit('/display/contents/save', jsonData);

src/main/webapp/ux/js/admin.popup.js

@@ -472,8 +472,9 @@ var cfnOpenGoodsQnaDetailPopup = function(counselSq) {
  * @since  : 2020/02/25
  * @author : sasa004
  */
-var cfnOpenMainContentsPopup = function(cateNo, contentsLoc) {
+var cfnOpenMainContentsPopup = function(cateNo, contentsLoc, brandGroupNo) {
 	var actionUrl = "/display/main/contents/popup/form?cateNo="+cateNo+"&contentsLoc=" + contentsLoc;
+	if (typeof(brandGroupNo) != 'undefined') actionUrl += "&brandGroupNo=" + brandGroupNo;
 	uifnPopupClose('popupMainContents');
 	cfnOpenModalPopup(actionUrl, 'popupMainContents');
 }
@@ -887,8 +888,9 @@ var cfnOpenGoodsDispOrdChangePopup = function(callbackfun, params) {
  * @since  : 2021/02/24
  * @author : bin2107
  */
-var cfnOpenMainMultiContentsPopup = function(cateNo, contentsLoc) {
+var cfnOpenMainMultiContentsPopup = function(cateNo, contentsLoc, brandGroupNo) {
 	var actionUrl = "/display/main/multicontents/popup/form?cateNo="+cateNo+"&contentsLoc=" + contentsLoc;
+	if (typeof(brandGroupNo) != 'undefined') actionUrl += "&brandGroupNo=" + brandGroupNo;
 	//uifnPopClose('popupMainMultiContents');
 	cfnOpenModalPopup(actionUrl, 'popupMainMultiContents');
 }
@@ -943,7 +945,8 @@ var cfnOpenLookbookBannerPickerPopup = function(lookbookbSq, imgNm) {
  * @since  : 2021/03/10
  * @author : bin2107
  */
-var cfnOpenMainGnbContentsPopup = function(cateNo, contentsLoc) {
+var cfnOpenMainGnbContentsPopup = function(cateNo, contentsLoc, brandGroupNo) {
 	var actionUrl = "/display/main/gnbcontents/popup/form?cateNo="+cateNo+"&contentsLoc=" + contentsLoc;
+	if (typeof(brandGroupNo) != 'undefined') actionUrl += "&brandGroupNo=" + brandGroupNo;
 	cfnOpenModalPopup(actionUrl, 'popupMainGnbContents');
 }