From bdd08c7e4e7b29c093187c5d55fbefc2e1b2308e Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 25 Nov 2025 00:01:39 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=94=9F=E4=BA=A7=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E9=9D=A2=E6=96=99?= =?UTF-8?q?=E5=92=8C=E5=86=85=E9=87=8C=E6=9D=90=E8=B4=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java index 0e4e756bf..ee646c112 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java @@ -199,12 +199,12 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService List prodColorList = this.storeProdColorMapper.selectList(new LambdaQueryWrapper() .in(StoreProductColor::getId, demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdColorId).distinct().collect(Collectors.toList()))); Map liningMaterialMap = CollectionUtils.isEmpty(prodColorList) ? new HashMap<>() - : prodColorList.stream().collect(Collectors.toMap(StoreProductColor::getId, StoreProductColor::getShoeUpperLiningMaterial)); + : prodColorList.stream().collect(Collectors.toMap(StoreProductColor::getId, StoreProductColor::getShoeUpperLiningMaterial, (v1, v2) -> v2)); // 查询面料材质 List prodCateAttrList = this.prodCateAttrMapper.selectList(new LambdaQueryWrapper() .in(StoreProductCategoryAttribute::getStoreProdId, demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdId).distinct().collect(Collectors.toList()))); Map shaftMaterialMap = CollectionUtils.isEmpty(prodCateAttrList) ? new HashMap<>() - : prodCateAttrList.stream().collect(Collectors.toMap(StoreProductCategoryAttribute::getStoreProdId, StoreProductCategoryAttribute::getShaftMaterial)); + : prodCateAttrList.stream().collect(Collectors.toMap(StoreProductCategoryAttribute::getStoreProdId, StoreProductCategoryAttribute::getShaftMaterial, (v1, v2) -> v2)); // 提取需求详情ID列表，用于后续查询抵扣信息 List demandDetailIdList = demandList.stream().map(StoreProdDemandPageResDTO::getStoreProdDemandDetailId).distinct().collect(Collectors.toList()); // 找到需求单抵扣的数据