Browse Source

fix: 导出个人执行包、导出个人任务明细NPE异常

lixuesong 2 days ago
parent
commit
a1aea88701

+ 9 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageExportServiceImpl.java

@@ -185,7 +185,15 @@ public class WmScorePackageExportServiceImpl implements WmScorePackageExportServ
 		Map<String, SysUser> packageUserMap = scorePackageStatuses.stream()
 				.collect(Collectors.toMap(
 						WmScorePackageStatus::getPackageId,
-						ps -> userMap.get(Integer.parseInt(ps.getUserId())),
+						ps -> {
+							SysUser queryUser = userMap.get(Integer.parseInt(ps.getUserId()));
+							if (queryUser != null) {
+								return queryUser;
+							}
+
+							log.warn("用户不存在或已被删除:{}", ps.getUserId());
+							return new SysUser();
+						},
 						(u1, u2) -> u1));
 
 		// 根据包id分组

+ 9 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskDetailExportServiceImpl.java

@@ -185,7 +185,15 @@ public class WmTaskDetailExportServiceImpl implements WmTaskDetailExportService
 		Map<String, SysUser> packageUserMap = scorePackageStatuses.stream()
 				.collect(Collectors.toMap(
 						WmScorePackageStatus::getPackageId,
-						ps -> userMap.get(Integer.parseInt(ps.getUserId())),
+						ps -> {
+							SysUser queryUser = userMap.get(Integer.parseInt(ps.getUserId()));
+							if (queryUser != null) {
+								return queryUser;
+							}
+
+							log.warn("用户不存在或已被删除:{}", ps.getUserId());
+							return new SysUser();
+						},
 						(u1, u2) -> u1));
 
 		// 根据包id分组