From c26eea118a55a8c4b9adf1300b8e7a80a12de354 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 13 Sep 2020 19:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=86=E7=B1=BB=E9=80=92?= =?UTF-8?q?=E5=BD=92=E5=A4=8D=E6=9D=82=E5=BA=A6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/rest/StoreProductController.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 82dc98f7..14f5f85d 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 @@ -61,9 +61,9 @@ import java.util.Map; import java.util.stream.Collectors; /** -* @author hupeng -* @date 2019-10-04 -*/ + * @author hupeng + * @date 2019-10-04 + */ @Api(tags = "商城:商品管理") @RestController @RequestMapping("api") @@ -165,6 +165,7 @@ public class StoreProductController { //商品分类 List storeCategories = yxStoreCategoryService.lambdaQuery() .eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue()) + .orderByAsc(YxStoreCategory::getPid) .list(); List> cateList = new ArrayList<>(); @@ -265,7 +266,12 @@ public class StoreProductController { data.remove(i); i--; - this.makeCate(data,cateList,storeCategory.getId(),level + 1); + if(storeCategory.getPid() > 0){ + this.makeCate(data,cateList,storeCategory.getPid(),level); + }else{ + this.makeCate(data,cateList,storeCategory.getId(),level + 1); + } + } }