From aae7510d135bb76ed68d05e05825b2e85bd4d020 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 20 Apr 2024 13:12:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=202.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=87=AA=E6=8F=90=E7=9A=84=E9=A1=B5=E9=9D=A2=E5=91=88=E7=8E=B0?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistrilbutionBillLadingMapper.xml | 2 +- .../supervise/service/impl/IndicatorsServiceImpl.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) 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;