feat(all): 解决自提报表提货扫描人和文员复核人错误显示的问题

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<User> data = listR.getData();
 				Map<Long, String> collect = data.stream().collect(Collectors.toMap(User::getId, User::getName));
 				for (BillLoadingDetailsVO detailsVO : detailsPage) {
-					detailsVO.setScanUser(collect.get(detailsVO.getScanUser()));
+					if (StrUtil.isNotEmpty(detailsVO.getScanUser())) {
-					detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser()));
+						detailsVO.setScanUser(collect.get(Convert.toLong(detailsVO.getScanUser())));
+					}
+					if (StrUtil.isNotEmpty(detailsVO.getExamineUser())) {
+						detailsVO.setExamineUser(collect.get(Convert.toLong(detailsVO.getExamineUser())));
+					}
 				}
 			}