Просмотр исходного кода

pms 查看瑞恒日报详情 bug

zhangcl 1 месяц назад
Родитель
Сommit
1e9150ebca

+ 7 - 3
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -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());
+            }
         }
 
         // 查询日报关联油耗记录