Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -87,7 +87,7 @@ public class TsfPlanningController extends TsfBaseController {
 	 * @since 2021. 3. 5
 	 */
 	@GetMapping("/main/form")
-	public ModelAndView planningMainForm(@RequestParam(value = "cateNo", required = false) Integer cateNo) {
+	public ModelAndView planningMainForm(@RequestParam(value = "cateNo", required = false) Integer cateNo, @RequestParam(value = "brandGroupNo", required = false) Integer brandGroupNo) {
 		ModelAndView mav = new ModelAndView(super.getDeviceViewName("planning/PlanningMainForm"));
 
 		Plan plan = new Plan();
@@ -98,6 +98,7 @@ public class TsfPlanningController extends TsfBaseController {
 		mav.addObject("cateList", planningService.getPlanningCategoryList(plan));
 
 		mav.addObject("cateNo", cateNo);
+		mav.addObject("brandGroupNo", brandGroupNo);
 
 		return mav;
 	}

src/main/webapp/WEB-INF/views/mob/planning/PlanningMainFormMob.html

@@ -53,9 +53,10 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	let fnGetPlanningList = function(cateNo) {
+	let fnGetPlanningList = function(cateNo,brandGroupNo) {
 		let actionUrl = '/planning/main/list';
 		if (!gagajf.isNull(cateNo)) actionUrl += '?cateNo=' + cateNo;
+		if (!gagajf.isNull(brandGroupNo)) actionUrl += '?brandGroupNo=' + brandGroupNo;
 		
 		$.getJSON(actionUrl
 			, function(result, status) {
@@ -118,7 +119,7 @@
 	}
 	
 	$(document).ready(function() {
-		fnGetPlanningList([[${cateNo}]]);
+		fnGetPlanningList([[${cateNo}]],[[${brandGroupNo}]]);
 	});
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -113,9 +113,10 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	let fnGetPlanningList = function(cateNo) {
+	let fnGetPlanningList = function(cateNo,brandGroupNo) {
 		let actionUrl = '/planning/main/list';
 		if (!gagajf.isNull(cateNo)) actionUrl += '?cateNo=' + cateNo;
+		if (!gagajf.isNull(brandGroupNo)) actionUrl += '?brandGroupNo=' + brandGroupNo;
 		
 		$.getJSON(actionUrl	, function(result, status) {
 				if (status == 'success') {
@@ -185,7 +186,7 @@
 	}
 	
 	$(document).ready(function() {
-		fnGetPlanningList([[${cateNo}]]);
+		fnGetPlanningList([[${cateNo}]],[[${brandGroupNo}]]);
 	});
 /*]]>*/
 </script>