From 5e1b4b6187bc89dba52fb706fb214afcd52bdc45 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 25 Jan 2021 11:27:45 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java index 6532389..f4a9622 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java @@ -67,7 +67,13 @@ SysShopInfo zbShop = shopInfoDao.selectZbShop(user.getCompanyId()); ShoppingGoodsCategory category = new ShoppingGoodsCategory(); category.setShopId(zbShop.getId()); - return AjaxResult.buildSuccessInstance(shoppingGoodsCategoryService.findByModel(category)); + List<ShoppingGoodsCategory> list = new ArrayList<>(); + List<ShoppingGoodsCategory> byModel = shoppingGoodsCategoryService.findByModel(category); + ShoppingGoodsCategory type = new ShoppingGoodsCategory(); + type.setName("全部"); + list.add(type); + list.addAll(byModel); + return AjaxResult.buildSuccessInstance(list); } @ApiOperation(value = "获取商品列表", notes = "获取商品列表") -- Gitblit v1.9.1