原矿运输运单分页查询逻辑非空校验

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

@@ -941,14 +941,18 @@ public class WaybillOrderService {
 
         List<WaybillOrderStatusResp> ordderList = new ArrayList<>();
         //1.查询正常流程物流运运单
-        List<WaybillOrderStatusResp> normalOrdderList = getWaybillOrderStatusResps(param, records, typeNullList,
-                orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.FALSE);
-        ordderList.addAll(normalOrdderList);
+        if (CollectionUtils.isNotEmpty(typeOneList)) {
+            List<WaybillOrderStatusResp> normalOrdderList = getWaybillOrderStatusResps(param, records, typeNullList,
+                    orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.FALSE);
+            ordderList.addAll(normalOrdderList);
+        }
 
         //2.查询原矿运输物流运运单
-        List<WaybillOrderStatusResp> rawOreOrdderList = getWaybillOrderStatusResps(param, records, typeOneList,
-                orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.TRUE);
-        ordderList.addAll(rawOreOrdderList);
+        if (CollectionUtils.isNotEmpty(ordderList)) {
+            List<WaybillOrderStatusResp> rawOreOrdderList = getWaybillOrderStatusResps(param, records, typeOneList,
+                    orderSubtaskList, logOrderIdList, wbOrderIdList, subtaskMap, logOrderIdAndCirculateMap, Boolean.TRUE);
+            ordderList.addAll(rawOreOrdderList);
+        }
 
         return ordderList;
     }