2024年7月25日15:34:20

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -163,19 +163,19 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
             WarehouseInfoVO warehouseInfoVO = new WarehouseInfoVO();
             BeanUtils.copyProperties(tWarehouse1, warehouseInfoVO);
             if (!fPropertiesList.isEmpty() && ObjectUtils.isNotNull(tWarehouse1.getfProperties())){
-                List<SysDictData> fProperties = fPropertiesList.stream().filter(e-> tWarehouse1.getfProperties().contains(e.getDictLabel())).collect(Collectors.toList());
+                List<SysDictData> fProperties = fPropertiesList.stream().filter(e-> tWarehouse1.getfProperties().contains(e.getDictValue())).collect(Collectors.toList());
                 if (!fProperties.isEmpty()){
                     warehouseInfoVO.setfProperties(fProperties.stream().map(SysDictData::getDictLabel).collect(Collectors.joining(",")));
                 }
             }
             if (!fTypeList.isEmpty() && ObjectUtils.isNotNull(tWarehouse1.getfType())){
-                List<SysDictData> fType = fTypeList.stream().filter(e-> tWarehouse1.getfType().contains(e.getDictLabel())).collect(Collectors.toList());
+                List<SysDictData> fType = fTypeList.stream().filter(e-> tWarehouse1.getfType().contains(e.getDictValue())).collect(Collectors.toList());
                 if (!fType.isEmpty()){
                     warehouseInfoVO.setfType(fType.stream().map(SysDictData::getDictLabel).collect(Collectors.joining(",")));
                 }
             }
             if (!fGoodsTypeList.isEmpty() && ObjectUtils.isNotNull(tWarehouse1.getfGoodsType())){
-                List<SysDictData> fGoodsType = fGoodsTypeList.stream().filter(e-> tWarehouse1.getfGoodsType().contains(e.getDictLabel())).collect(Collectors.toList());
+                List<SysDictData> fGoodsType = fGoodsTypeList.stream().filter(e-> tWarehouse1.getfGoodsType().contains(e.getDictValue())).collect(Collectors.toList());
                 if (!fGoodsType.isEmpty()){
                     warehouseInfoVO.setfGoodsType(fGoodsType.stream().map(SysDictData::getDictLabel).collect(Collectors.joining(",")));
                 }