diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 9c5971e2..ab63249d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -54,8 +54,6 @@ import java.util.*; @RequestMapping("api") public class StoreProductController { - private static List> cateList = new ArrayList<>(); - private final YxStoreProductService yxStoreProductService; private final YxStoreCategoryService yxStoreCategoryService; private final YxShippingTemplatesService yxShippingTemplatesService; @@ -138,7 +136,9 @@ public class StoreProductController { List storeCategories = yxStoreCategoryService.lambdaQuery() .eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue()) .list(); - map.put("cateList", this.makeCate(storeCategories,0,1)); + + List> cateList = new ArrayList<>(); + map.put("cateList", this.makeCate(storeCategories,cateList,0,1)); //商品规格 map.put("ruleList",yxStoreProductRuleService.list()); @@ -193,16 +193,11 @@ public class StoreProductController { * @param level d等级 * @return list */ - private List> makeCate(List data, int pid, int level) + private List> makeCate(List data,List> cateList,int pid, int level) { String html = "|-----"; String newHtml = ""; - - if(cateList.size() == data.size()){ - return cateList; - } - for (int i = 0; i < data.size(); i++) { YxStoreCategory storeCategory = data.get(i); int catePid = storeCategory.getPid(); @@ -220,7 +215,7 @@ public class StoreProductController { data.remove(i); i--; - this.makeCate(data,storeCategory.getId(),level + 1); + this.makeCate(data,cateList,storeCategory.getId(),level + 1); } }