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 getProdGroupPage(ProdGroupDTO param) { QueryWrapper queryWrapper = buildQueryWrapper(param); - return super.pageAs(PageUtil.buildPage(), queryWrapper, ProdGroupDTO.class); - } - - @Override - public List getProdGroupList(ProdGroupDTO param) { - QueryWrapper queryWrapper = buildQueryWrapper(param); - queryWrapper.eq(ProdGroup::getStatus, SystemConstants.OneZero.ONE); - List groups = listAs(queryWrapper, ProdGroupDTO.class); - groups.forEach(group -> { + Page page = pageAs(PageUtil.buildPage(), queryWrapper, ProdGroupDTO.class); + page.getRecords().forEach(group -> { List 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()); } }); - return groups; + return page; + } + + @Override + public List getProdGroupList(ProdGroupDTO param) { + QueryWrapper queryWrapper = buildQueryWrapper(param); + queryWrapper.eq(ProdGroup::getStatus, SystemConstants.OneZero.ONE); + return super.listAs(queryWrapper, ProdGroupDTO.class); } @Override