diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index ae1b8dd7e..14a13a4f9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -49,7 +49,7 @@ dbl.total_cost totalCost, dbl.pick_up_plate pickUpPlate,dbl.pickup_batch pickupBatch, ( - select COUNT(id) + select COUNT(quantity) from logpm_distribution_bill_lading_scan where bill_lading_id = dbl.id ) stopNum, diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java index 1c6afe8f0..d69b1d098 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java @@ -189,8 +189,14 @@ public class IndicatorsServiceImpl extends BaseServiceImpl userR = userClient.userInfoById(createUser); - String userName = userR.getData().getName(); - exportIndicatorsVO.setCreateUserName(userName); + if(userR.isSuccess()){ + if(!Objects.isNull(userR.getData())){ + String userName = userR.getData().getName(); + exportIndicatorsVO.setCreateUserName(userName); + } + + } + } return list;