|
@@ -215,7 +215,7 @@ public class ProductNewController extends BaseController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
List<CmBrand> brandList = productService.findBrandList();
|
|
List<CmBrand> brandList = productService.findBrandList();
|
|
- Map<String, Object> classify = productService.findClassify();
|
|
|
|
|
|
+ Map<String, Object> classify = productService.findClassify(1);
|
|
model.addAttribute("brandList", brandList);
|
|
model.addAttribute("brandList", brandList);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("page", page);
|
|
model.addAttribute("page", page);
|
|
@@ -262,7 +262,7 @@ public class ProductNewController extends BaseController {
|
|
}
|
|
}
|
|
product.setCommodityType(StringUtils.isEmpty(product.getCommodityType()) ? "0" : product.getCommodityType());
|
|
product.setCommodityType(StringUtils.isEmpty(product.getCommodityType()) ? "0" : product.getCommodityType());
|
|
List<CmBrand> brandList = productService.findBrandList();
|
|
List<CmBrand> brandList = productService.findBrandList();
|
|
- Map<String, Object> classify = productService.findClassify();
|
|
|
|
|
|
+ Map<String, Object> classify = productService.findClassify(1);
|
|
List<Province> provinceList = areaService.loadProvince();
|
|
List<Province> provinceList = areaService.loadProvince();
|
|
List<CmProductCombination> combinationList = cmProductCombinationService.findProductCombinationList();
|
|
List<CmProductCombination> combinationList = cmProductCombinationService.findProductCombinationList();
|
|
|
|
|
|
@@ -417,7 +417,7 @@ public class ProductNewController extends BaseController {
|
|
return "redirect:" + Global.getAdminPath() + "/product/new/list/";
|
|
return "redirect:" + Global.getAdminPath() + "/product/new/list/";
|
|
}
|
|
}
|
|
product.setCommodityType(StringUtils.isEmpty(product.getCommodityType()) ? "0" : product.getCommodityType());
|
|
product.setCommodityType(StringUtils.isEmpty(product.getCommodityType()) ? "0" : product.getCommodityType());
|
|
- Map<String, Object> classify = productService.findClassify();
|
|
|
|
|
|
+ Map<String, Object> classify = productService.findClassify(1);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("product", product);
|
|
model.addAttribute("product", product);
|
|
return "modules/product-new/fastEdit";
|
|
return "modules/product-new/fastEdit";
|
|
@@ -434,7 +434,7 @@ public class ProductNewController extends BaseController {
|
|
}
|
|
}
|
|
model.addAttribute("product", product);
|
|
model.addAttribute("product", product);
|
|
|
|
|
|
- Map<String, Object> classify = productService.findClassify();
|
|
|
|
|
|
+ Map<String, Object> classify = productService.findClassify(1);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("classify", classify);
|
|
|
|
|
|
List<ProductCustomClassification> customClassify = productService.getProductTypes(product.getProductID());
|
|
List<ProductCustomClassification> customClassify = productService.getProductTypes(product.getProductID());
|
|
@@ -849,7 +849,7 @@ public class ProductNewController extends BaseController {
|
|
} else {
|
|
} else {
|
|
model.addAttribute("recommendType", recommendType);
|
|
model.addAttribute("recommendType", recommendType);
|
|
}
|
|
}
|
|
- Map<String, Object> classify = productService.findClassify();
|
|
|
|
|
|
+ Map<String, Object> classify = productService.findClassify(1);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("classify", classify);
|
|
model.addAttribute("product", product);
|
|
model.addAttribute("product", product);
|
|
model.addAttribute("recommendList", recommendList);
|
|
model.addAttribute("recommendList", recommendList);
|