From 6364dadd76a2a949a7d1230aefeb877ccd3959a8 Mon Sep 17 00:00:00 2001
From: taochengbo <552920369@qq.com>
Date: Tue, 21 Jul 2020 23:42:28 +0800
Subject: [PATCH] =?UTF-8?q?bug--=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=87=8D=E5=A4=8D=E9=81=8D=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/rest/StoreProductController.java      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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<Map<String,Object>> cateList = new ArrayList<>();
-
     private final YxStoreProductService yxStoreProductService;
     private final YxStoreCategoryService yxStoreCategoryService;
     private final YxShippingTemplatesService yxShippingTemplatesService;
@@ -138,7 +136,9 @@ public class StoreProductController {
         List<YxStoreCategory> storeCategories = yxStoreCategoryService.lambdaQuery()
                 .eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue())
                 .list();
-        map.put("cateList", this.makeCate(storeCategories,0,1));
+
+        List<Map<String,Object>> 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<Map<String,Object>> makeCate(List<YxStoreCategory> data, int pid, int level)
+    private List<Map<String,Object>> makeCate(List<YxStoreCategory> data,List<Map<String,Object>> 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);
             }
         }