Merge branch 'dev_20260131' of https://git.sckaiwu.cn/kaiwu-rep/sckw-service-platform into dev_20260131

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtGatekeeperWaybillOrderRepository.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.repository;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.transport.dao.KwtGatekeeperWaybillOrderMapper;
@@ -7,7 +8,6 @@ import com.sckw.transport.model.KwtGatekeeperWaybillOrder;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -47,7 +47,7 @@ public class KwtGatekeeperWaybillOrderRepository extends ServiceImpl<KwtGatekeep
     public List<KwtGatekeeperWaybillOrder> queryGatekeeperWaybillOrderByEntId(Set<Long> waybillOrderIds, List<Integer> status) {
         return list(
                 Wrappers.<KwtGatekeeperWaybillOrder>lambdaQuery()
-                        .in(Objects.nonNull(waybillOrderIds), KwtGatekeeperWaybillOrder::getEntId, waybillOrderIds)
+                        .in(CollectionUtils.isNotEmpty(waybillOrderIds), KwtGatekeeperWaybillOrder::getWOrderId, waybillOrderIds)
                         .in(KwtGatekeeperWaybillOrder::getStatus, status)
                         .orderByDesc(KwtGatekeeperWaybillOrder::getId));
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderSubtaskRepository.java

@@ -100,7 +100,7 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
     public List<KwtWaybillOrderSubtask> queryWaybillOrderSubByEntIdAndStatus(Set<Long> logOrderIds, Integer status, LocalDateTime startTime, LocalDateTime endTime) {
         return list(Wrappers.<KwtWaybillOrderSubtask>lambdaQuery()
                 .eq(KwtWaybillOrderSubtask::getDelFlag,0)
-                .in(Objects.nonNull(logOrderIds),KwtWaybillOrderSubtask::getLOrderId,logOrderIds)
+                .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId,logOrderIds)
                 .eq(Objects.nonNull(status),KwtWaybillOrderSubtask::getStatus,status)
                 .ge(Objects.nonNull(startTime), KwtWaybillOrderSubtask::getUpdateTime, startTime)
                 .le(Objects.nonNull(endTime), KwtWaybillOrderSubtask::getUpdateTime, endTime)