no message

mall-server-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitSalesController.java

@@ -182,7 +182,7 @@ public class WebsitSalesController {
     @ApiOperation(value = "网点销售订单-辅材库存分类")
     public ResponseHelper<List<WebsitSalesCategoryVO>> existStockCategory(
             @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "仓库id", required = true) @RequestParam String storageId
+            @ApiParam(value = "仓库id", required = false) @RequestParam(required = false) String storageId
     ) throws RemoteServiceException {
         List<WebsitSalesCategoryVO> list = websitSalesLogic.existStockCategory(websitId, storageId);
         return ResponseHelper.success(list);

mall-server-api/src/main/resources/mapper/MaterialMapper.xml

@@ -198,7 +198,9 @@
                 LEFT JOIN websit_goods_category c ON b.goods_category_id = c.category_id
         WHERE
             a.company_wechat_id = #{companyWechatId}
-            AND a.storage_id = #{storageId}
+            <if test="storageId != null and storageId != ''">
+                AND a.storage_id = #{storageId}
+            </if>
             AND a.websit_id = #{websitId}
             AND a.goods_type = 'M'
             <!-- AND a.qty > 0 -->