From 4f7aae3840245affab7163e83c1316d1ceb05cf9 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 29 Apr 2026 13:40:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProdGroupServiceImpl.java    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java
index 9dadc75c1..8e72efa23 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProdGroupServiceImpl.java
@@ -61,15 +61,8 @@ public class ProdGroupServiceImpl extends ServiceImpl<ProdGroupMapper, ProdGroup
     @Override
     public Page<ProdGroupDTO> getProdGroupPage(ProdGroupDTO param) {
         QueryWrapper queryWrapper = buildQueryWrapper(param);
-        return super.pageAs(PageUtil.buildPage(), queryWrapper, ProdGroupDTO.class);
-    }
-
-    @Override
-    public List<ProdGroupDTO> getProdGroupList(ProdGroupDTO param) {
-        QueryWrapper queryWrapper = buildQueryWrapper(param);
-        queryWrapper.eq(ProdGroup::getStatus, SystemConstants.OneZero.ONE);
-        List<ProdGroupDTO> groups = listAs(queryWrapper, ProdGroupDTO.class);
-        groups.forEach(group -> {
+        Page<ProdGroupDTO> page = pageAs(PageUtil.buildPage(), queryWrapper, ProdGroupDTO.class);
+        page.getRecords().forEach(group -> {
             List<Long> productIdList = prodGroupRelationMapper.selectObjectListByQueryAs(query()
                     .select(ProdGroupRelation::getProductId).eq(ProdGroupRelation::getProdGroupId, group.getId()), Long.class);
             if (CollUtil.isNotEmpty(productIdList)) {
@@ -81,7 +74,14 @@ public class ProdGroupServiceImpl extends ServiceImpl<ProdGroupMapper, ProdGroup
                 group.setProductList(new ArrayList<>());
             }
         });
-        return groups;
+        return page;
+    }
+
+    @Override
+    public List<ProdGroupDTO> getProdGroupList(ProdGroupDTO param) {
+        QueryWrapper queryWrapper = buildQueryWrapper(param);
+        queryWrapper.eq(ProdGroup::getStatus, SystemConstants.OneZero.ONE);
+        return super.listAs(queryWrapper, ProdGroupDTO.class);
     }
 
     @Override