diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml index a955116e6..eee4a32fa 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml @@ -88,7 +88,7 @@ lbda.carrier_id carrierId, lbda.transportation_agreement transportationAgreement, lbda.user_id userId, - (SELECT GROUP_CONCAT(brand_id SEPARATOR ',') from logpm_basicdata_drivermiddle lbd WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles + (SELECT GROUP_CONCAT(lbv.vehicle_nub SEPARATOR ',') from logpm_basicdata_drivermiddle lbd LEFT JOIN logpm_basicdata_vehicle AS lbv ON lbd.brand_id = lbv.id WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles FROM logpm_basicdata_driver_artery lbda diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 0beb50a86..6d16659fe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -559,6 +559,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl