|
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Repository;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Objects;
|
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -33,7 +34,7 @@ public class KwtLogisticsOrderCirculateRepository extends ServiceImpl<KwtLogisti
|
|
|
public List<KwtLogisticsOrderCirculate> findOneByLogOrderIdsAndTruckId(List<Long> logOrderIds, Long truckId) {
|
|
public List<KwtLogisticsOrderCirculate> findOneByLogOrderIdsAndTruckId(List<Long> logOrderIds, Long truckId) {
|
|
|
return list(Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery().eq(KwtLogisticsOrderCirculate::getDelFlag,0)
|
|
return list(Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery().eq(KwtLogisticsOrderCirculate::getDelFlag,0)
|
|
|
.in(KwtLogisticsOrderCirculate::getLOrderId, logOrderIds)
|
|
.in(KwtLogisticsOrderCirculate::getLOrderId, logOrderIds)
|
|
|
- .eq(KwtLogisticsOrderCirculate::getTruckId, truckId)
|
|
|
|
|
|
|
+ .eq(Objects.nonNull(truckId),KwtLogisticsOrderCirculate::getTruckId, truckId)
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
|
|
|