diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index ea1cb1ce..c770aa09 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -46,9 +46,11 @@ public class ShopController extends BaseController { } @GetMapping("/platformList") - public TableDataInfo platformList() - { - List list = platformService.list(); + public TableDataInfo platformList(Integer status) { + LambdaQueryWrapper qw = new LambdaQueryWrapper() + .eq(status!=null,OShopPlatform::getStatus,status); + qw.orderByAsc(OShopPlatform::getSort); + List list = platformService.list(qw); return getDataTable(list); } diff --git a/vue/src/views/shop/goods/index.vue b/vue/src/views/shop/goods/index.vue index 1f38c8a2..78efeccd 100644 --- a/vue/src/views/shop/goods/index.vue +++ b/vue/src/views/shop/goods/index.vue @@ -1,27 +1,36 @@