diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java index c1787025b..432475c8f 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppProductCategoryController.java @@ -30,12 +30,14 @@ public class AppProductCategoryController { @Operation(summary = "查询商品分类列表") @PostMapping("page") public R> page(@RequestBody ProductCategoryBo query, Page page) { + query.setShowStatus(1); Page productCategoryPage = service.page(page,query.toWrapper()); return R.ok(convert.toVO(productCategoryPage)); } @Operation(summary = "查询列表") @PostMapping("/tree") public R> tree(@RequestBody ProductCategoryBo bo ) { + bo.setShowStatus(1); List articleList = service.tree( bo.toWrapper()); return R.ok( articleList); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java index 7af905a9d..a6b1a8795 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java @@ -38,6 +38,7 @@ public class ProductCategoryBo { .eq(showStatus != null, ProductCategory::getShowStatus, showStatus) .eq(sort != null, ProductCategory::getSort, sort) .eq(icon != null && !icon.isEmpty(), ProductCategory::getIcon, icon) - .like(nameLike != null && !nameLike.isEmpty(), ProductCategory::getName, nameLike); + .like(nameLike != null && !nameLike.isEmpty(), ProductCategory::getName, nameLike) + .orderByAsc(ProductCategory::getSort); } }