海空运出货列表查询bug修复

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/WarehouseService.java

@@ -153,6 +153,8 @@ public interface WarehouseService {
      */
     List<WarehouseDO> findByCountryIdList(List<Long> countryIdList);
 
+    List<WarehouseDO> findByCountryIdListAndCityIdList(List<Long> countryIdList, List<Long> cityIdList);
+
     List<WarehouseDO> getByIdList(List<Long> idList);
 
     List<WarehouseDO> getAvailableWarehouseAdjustmentList(Long id);

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseServiceImpl.java

@@ -444,6 +444,14 @@ public class WarehouseServiceImpl implements WarehouseService {
         );
     }
 
+    @Override
+    public List<WarehouseDO> findByCountryIdListAndCityIdList(List<Long> countryIdList, List<Long> cityIdList) {
+        return warehouseMapper.selectList(new LambdaQueryWrapperX<WarehouseDO>()
+                .in(StringUtils.isNotEmpty(countryIdList), WarehouseDO::getGuojia, countryIdList)
+                .in(StringUtils.isNotEmpty(cityIdList), WarehouseDO::getShi, cityIdList)
+        );
+    }
+
     @Override
     public List<WarehouseDO> getAvailableWarehouseAdjustmentList(Long id) {
         WarehouseDO currentWarehouseDO = warehouseMapper.selectById(id);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -1577,11 +1577,19 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
             query.setWarehouseIdList(warehouseIdList);
         }
-        if (CollectionUtil.isNotEmpty(query.getCountryIdList())) {
+
+        if (CollectionUtil.isNotEmpty(query.getCountryIdList()) || CollectionUtil.isNotEmpty(query.getDestCityIdList())) {
             List<WarehouseDO> warehouseList =
-                    warehouseService.findByCountryIdList(query.getCountryIdList());
-            warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
-            query.setWarehouseIdList(warehouseIdList);
+                    warehouseService.findByCountryIdListAndCityIdList(query.getCountryIdList(), query.getDestCityIdList());
+            if (CollectionUtil.isNotEmpty(warehouseList)){
+                warehouseIdList = warehouseList.stream().map(WarehouseDO::getId).collect(Collectors.toList());
+                Set<Long> destWarehouseIdSet = new HashSet<>();
+                if (CollectionUtil.isNotEmpty(query.getDestWarehouseIdList())) {
+                    destWarehouseIdSet.addAll(query.getDestWarehouseIdList());
+                }
+                destWarehouseIdSet.addAll(warehouseIdList);
+                query.setDestWarehouseIdList(new ArrayList<>(destWarehouseIdSet));
+            }
         }
         //上面都是处理查询条件相关逻辑
         return boxInfoQuery1(boxMapper.selectPage2(page, query), false);