分页查询物流订单接口，原矿和正常流程物流订单id过滤

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -242,10 +242,10 @@ public class WaybillOrderService {
 
         List<LogisticsOrderResp> orderList = new ArrayList<>();
         // 正常流程
-        List<LogisticsOrderResp> normalOrderList = getLogisticsOrderResps(param, typeNullList, logOrderIdList, logOrderIdAndCirculateMap, rTruckVo);
+        List<LogisticsOrderResp> normalOrderList = getLogisticsOrderResps(param, typeNullList, logOrderIdAndCirculateMap, rTruckVo);
         orderList.addAll(normalOrderList);
         // 原矿运输
-        List<LogisticsOrderResp> rawOreOrdderList = getRawOreLogisticsOrderResps(param, typeOneList, logOrderIdList, logOrderIdAndCirculateMap, rTruckVo);
+        List<LogisticsOrderResp> rawOreOrdderList = getRawOreLogisticsOrderResps(param, typeOneList, logOrderIdAndCirculateMap, rTruckVo);
         orderList.addAll(rawOreOrdderList);
 
         //内存分页
@@ -269,10 +269,11 @@ public class WaybillOrderService {
      * @return
      */
     private List<LogisticsOrderResp> getLogisticsOrderResps(OrderCirculateQueryParam param, List<KwtLogisticsOrder> logOrderList,
-                                                            List<Long> logOrderIdList,
                                                             Map<Long, KwtLogisticsOrderCirculate> logOrderIdAndCirculateMap,
                                                             RTruckVo rTruckVo) {
         log.info("开始查询正常流程物流订单，param:{}", JSON.toJSONString(param));
+        List<Long> logOrderIdList = logOrderList.stream().map(KwtLogisticsOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
+
         Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList = logOrderList.stream().collect(Collectors.groupingBy(KwtLogisticsOrder::getTOrderId));
 
         //物流id映射物流商品
@@ -363,10 +364,10 @@ public class WaybillOrderService {
      * @return
      */
     private List<LogisticsOrderResp> getRawOreLogisticsOrderResps(OrderCirculateQueryParam param, List<KwtLogisticsOrder> logOrderList,
-                                                                  List<Long> logOrderIdList,
                                                                   Map<Long, KwtLogisticsOrderCirculate> logOrderIdAndCirculateMap,
                                                                   RTruckVo rTruckVo) {
         log.info("开始查询原矿运输流程物流订单，param:{}", JSON.toJSONString(param));
+        List<Long> logOrderIdList = logOrderList.stream().map(KwtLogisticsOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
 
         Map<Long, List<KwtLogisticsOrder>> tradeIdAndLogOrderList = logOrderList.stream()
                 .collect(Collectors.groupingBy(KwtLogisticsOrder::getTOrderId));