From b07a0bf66f34630effb90f57a8a308ca66d76ff9 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Thu, 27 Mar 2025 11:08:17 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF/=E6=94=B6=E9=93=B6=E6=9C=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/admin/ProductController.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
index 4937fe2f9..0fa53f741 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
@@ -2,6 +2,8 @@ package com.czg.controller.admin;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
 import com.czg.annotation.SaStaffCheckPermission;
 import com.czg.config.RabbitPublisher;
 import com.czg.exception.CzgException;
@@ -63,11 +65,22 @@ public class ProductController {
     public CzgResult<List<ProductDTO>> getProductList(ProductDTO param) {
         Long shopId = StpKit.USER.getShopId(0L);
         param.setShopId(shopId);
-        List<ProductDTO> data = productService.getProductList(param);
+        List<ProductDTO> data = getProductCacheList(param);
         productService.refreshProductStock(param, data);
         return CzgResult.success(data);
     }
 
+    private List<ProductDTO> getProductCacheList(ProductDTO param) {
+        List<ProductDTO> productList = productService.getProductList(param);
+        if (StrUtil.isNotEmpty(param.getName())) {
+            productList = productList.stream().filter(obj -> StrUtil.contains(obj.getName(), param.getName())).toList();
+        }
+        if (ObjUtil.isNotNull(param.getCategoryId())) {
+            productList = productList.stream().filter(obj -> param.getCategoryId().equals(obj.getCategoryId())).toList();
+        }
+        return productList;
+    }
+
     /**
      * 商品-详情
      */
@@ -141,6 +154,7 @@ public class ProductController {
 
     /**
      * 商品-删除
+     *
      * @param id 商品ID
      */
     @DeleteMapping("{id}")