From b6df6fd74d279413d4274aae556bed494f6d6555 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Thu, 11 Jul 2024 18:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=9C=AA=E5=B8=A6=E5=85=A5=E5=88=86=E7=B1=BB=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/repository/product/TbProductSkuRepository.java    | 4 +++-
 .../cashier/service/impl/productimpl/StockServiceImpl.java    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
index 5d95f77e..0ea3964b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
@@ -95,12 +95,14 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
             "pro.shopId = :shopId " +
             "AND pro.status = 1 " +
             "AND sku.isDel=0 " +
+            "AND (:categoryId IS NULL OR pro.categoryId = :categoryId) " +
             "AND (:proName IS NULL OR pro.name LIKE %:proName%) " +
             "AND (:isStock IS NULL OR pro.isStock = :isStock) " +
             "group by pro.id " +
             "ORDER BY " +
             "pro.name DESC,sku.stockNumber DESC")
-    List<StockV2Vo> searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock);
+    List<StockV2Vo> searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock,
+                                     @Param("categoryId") String categoryId);
 
 
     @Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
index 670bab09..59653200 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
@@ -102,7 +102,8 @@ public class StockServiceImpl implements StockService {
     @Override
     public void downloadV2(StockQueryDto summaryDto, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
-        List<StockV2Vo> stockVos = tbProductSkuRepository.searchProStockV2(summaryDto.getShopId(), summaryDto.getName(), summaryDto.getIsStock());
+        List<StockV2Vo> stockVos = tbProductSkuRepository.searchProStockV2(summaryDto.getShopId(), summaryDto.getName(),
+                summaryDto.getIsStock(), summaryDto.getCategoryId());
         for (StockV2Vo all : stockVos) {
             if (all.getIsDistribute().equals(1)) {
                 Map<String, Object> map = new LinkedHashMap<>();