|
|
@@ -166,12 +166,16 @@ public class IotRhDailyReportController {
|
|
|
Long taskId = result.getTaskId();
|
|
|
if (ObjUtil.isNotEmpty(projectId)) {
|
|
|
IotProjectInfoDO project = iotProjectInfoService.getIotProjectInfo(projectId);
|
|
|
- result.setContractName(project.getContractName());
|
|
|
+ if (ObjUtil.isNotEmpty(project)) {
|
|
|
+ result.setContractName(project.getContractName());
|
|
|
+ }
|
|
|
}
|
|
|
if (ObjUtil.isNotEmpty(taskId)) {
|
|
|
IotProjectTaskDO task = iotProjectTaskService.getIotProjectTask(taskId);
|
|
|
- result.setTaskName(task.getWellName());
|
|
|
- result.setLocation(task.getLocation());
|
|
|
+ if (ObjUtil.isNotEmpty(task)) {
|
|
|
+ result.setTaskName(task.getWellName());
|
|
|
+ result.setLocation(task.getLocation());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 查询日报关联油耗记录
|