Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

修复null
2025-12-05 14:18:59 +08:00 · 2025-12-05 14:18:39 +08:00
1 changed files with 1 additions and 1 deletions
--- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
+++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java
@ -93,7 +93,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ
        Map<Long, DataCollectionEmployee> collect = employeeByIds.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, Function.identity()));
        list.forEach(item -> {
            Map<String, Object> record = new HashMap<>();
-            DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId());
+            DataCollectionEmployee simpleEmployee = collect.get(item.getEmployeeId()) ==null?new DataCollectionEmployee():collect.get(item.getEmployeeId());
            record.put("id", item.getId());
            record.put("employeeId", item.getEmployeeId());
            record.put("billMonth", item.getBillMonth());
Author	SHA1	Message	Date
钱涛	7acdc94380	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2025-12-05 14:18:59 +08:00
钱涛	b83a916610	修复null	2025-12-05 14:18:39 +08:00