From 472b4ff3c12702b532233a5aa575d17888fabc4d Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Fri, 21 Jun 2024 17:14:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=A7=A3=E5=86=B3=E8=87=AA?= =?UTF-8?q?=E6=8F=90=E6=8A=A5=E8=A1=A8=E6=8F=90=E8=B4=A7=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=BA=BA=E5=92=8C=E6=96=87=E5=91=98=E5=A4=8D=E6=A0=B8=E4=BA=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReportBillLoadingAsyncService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java index 9f6c53fc4..d0121be9b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java @@ -1,6 +1,7 @@ package com.logpm.report.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -114,8 +115,12 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer List data = listR.getData(); Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); for (BillLoadingDetailsVO detailsVO : detailsPage) { - detailsVO.setScanUser(collect.get(detailsVO.getScanUser())); - detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser())); + if (StrUtil.isNotEmpty(detailsVO.getScanUser())) { + detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser()))); + } + if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) { + detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser()))); + } } }