|
@@ -1123,9 +1123,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
|
|
|
}
|
|
|
map.put("scorePackageStatus", scorePackageMap.getOrDefault(wmtask.getScorePackageId(), new WmScorePackage()).getScorePackageStatus());
|
|
|
|
|
|
- if (wmtask.getDeptApprovalUserId() != null) {
|
|
|
- map.put("deptApprovalUserName", userMap.get(wmtask.getDeptApprovalUserId()));
|
|
|
- }
|
|
|
+ // 审批人
|
|
|
+ map.put("deptApprovalUserId", wmtask.getDeptApprovalUserId());
|
|
|
+ map.put("deptApprovalUserName", wmtask.getDeptApprovalUserId() != null ? userMap.get(wmtask.getDeptApprovalUserId()) : "");
|
|
|
|
|
|
return map;
|
|
|
}).collect(Collectors.toList());
|