|
@@ -284,7 +284,9 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
|
|
|
//查询项目报告信息
|
|
|
if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
|
|
|
ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
|
|
|
- info.setProjectName(projectReportData.getNumber());
|
|
|
+ if(null != projectReportData){
|
|
|
+ info.setProjectName(projectReportData.getNumber());
|
|
|
+ }
|
|
|
}
|
|
|
info.getWorkAccount().setProjectRadio(1);
|
|
|
}else{
|
|
@@ -1488,4 +1490,4 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
|
|
|
|
|
|
/*-----------------====== 新版本=====--------------------------*/
|
|
|
|
|
|
-}
|
|
|
+}
|