|
@@ -620,8 +620,10 @@ public class WorkInvoiceController extends BaseController {
|
|
|
ProjectRecords projectRecords = projectRecordsService.getInfo(obj);
|
|
|
Office company = projectRecordsService.getCompanyById(projectRecords.getCompany().getId());
|
|
|
map.put("companyName",company.getName());
|
|
|
- map.put("reportName",projectRecords.getReportData().getName());
|
|
|
- map.put("reportId",projectRecords.getReportData().getId());
|
|
|
+ if (null != projectRecords.getReportData()) {
|
|
|
+ map.put("reportName",projectRecords.getReportData().getName());
|
|
|
+ map.put("reportId",projectRecords.getReportData().getId());
|
|
|
+ }
|
|
|
map.put("pNumber",projectRecords.getProjectId());//项目编号
|
|
|
map.put("projectId",projectRecords.getId());//项目id
|
|
|
map.put("cName",projectRecords.getWorkContractInfo().getClient().getName());//委托方
|