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

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

@@ -241,12 +241,18 @@ public class WaybillOrderService {
         log.info("原矿运输的订单信息: {}，数量:{}", JSON.toJSONString(typeOneList), typeOneList.size());
 
         List<LogisticsOrderResp> orderList = new ArrayList<>();
+
         // 正常流程
-        List<LogisticsOrderResp> normalOrderList = getLogisticsOrderResps(param, typeNullList, logOrderIdAndCirculateMap, rTruckVo);
-        orderList.addAll(normalOrderList);
-        // 原矿运输
-        List<LogisticsOrderResp> rawOreOrdderList = getRawOreLogisticsOrderResps(param, typeOneList, logOrderIdAndCirculateMap, rTruckVo);
-        orderList.addAll(rawOreOrdderList);
+        //1.查询正常流程物流运运单
+        if (CollectionUtils.isNotEmpty(typeNullList)) {
+            List<LogisticsOrderResp> normalOrderList = getLogisticsOrderResps(param, typeNullList, logOrderIdAndCirculateMap, rTruckVo);
+            orderList.addAll(normalOrderList);
+        }
+        if (CollectionUtils.isNotEmpty(typeOneList)) {
+            // 原矿运输
+            List<LogisticsOrderResp> rawOreOrdderList = getRawOreLogisticsOrderResps(param, typeOneList, logOrderIdAndCirculateMap, rTruckVo);
+            orderList.addAll(rawOreOrdderList);
+        }
 
         //内存分页
         List<List<LogisticsOrderResp>> pageList = Lists.partition(orderList, param.getPageSize());
@@ -948,14 +954,14 @@ public class WaybillOrderService {
         //1.查询正常流程物流运运单
         if (CollectionUtils.isNotEmpty(typeNullList)) {
             List<WaybillOrderStatusResp> normalOrdderList = getWaybillOrderStatusResps(param, records, typeNullList,
-                    orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.FALSE);
+                    orderSubtaskList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.FALSE);
             ordderList.addAll(normalOrdderList);
         }
 
         //2.查询原矿运输物流运运单
         if (CollectionUtils.isNotEmpty(typeOneList)) {
             List<WaybillOrderStatusResp> rawOreOrdderList = getWaybillOrderStatusResps(param, records, typeOneList,
-                    orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.TRUE);
+                    orderSubtaskList,wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.TRUE);
             ordderList.addAll(rawOreOrdderList);
         }
 
@@ -970,13 +976,12 @@ public class WaybillOrderService {
     private List<WaybillOrderStatusResp> getWaybillOrderStatusResps(WaybillOrderQueryParam param, List<KwtWaybillOrder> records,
                                                                     List<KwtLogisticsOrder> logOrderList,
                                                                     List<KwtWaybillOrderSubtask> orderSubtaskList,
-                                                                    List<Long> logOrderIdList,
                                                                     List<Long> wbOrderIdList,
                                                                     Map<Long, KwtWaybillOrderSubtask> subtaskMap,
                                                                     Map<Long, KwtLogisticsOrderCirculate> logOrderIdAndCirculateMap,
                                                                     boolean isRawOre) {
         log.info("开始{}物流运单查询，param:{}", isRawOre ? "原矿运输" : "正常流程", JSON.toJSONString(param));
-
+        List<Long> logOrderIdList = logOrderList.stream().map(KwtLogisticsOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
         // 物流订单映射
         Map<Long, KwtLogisticsOrder> logOrderMap = logOrderList.stream().collect(Collectors.toMap(KwtLogisticsOrder::getId,
                 Function.identity(), (x, y) -> x));