diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index 4c10e2d..c9352b4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java @@ -106,6 +106,9 @@ public class ExperimentReportController extends JeecgController queryPageList(NasaDataRecord nasaDataRecord) { NasaDataRecordPage result = new NasaDataRecordPage(); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java index 4047bdd..72932a5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java @@ -164,6 +164,7 @@ public class LocalDatabaseController extends JeecgController queryPageList(NasaDataRecord nasaDataRecord) { NasaDataRecordPage result = new NasaDataRecordPage(); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java index 90d8465..71f2028 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java @@ -75,6 +75,7 @@ public class NasaDataRecordController extends JeecgController queryPageList(NasaDataRecord nasaDataRecord) { NasaDataRecordPage result = new NasaDataRecordPage(); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java index 7df611c..ccbed47 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDocServiceImpl.java @@ -69,13 +69,13 @@ public class ExperimentDocServiceImpl extends ServiceImpl(); } ExperimentReport latestReport = experimentReportService.getLatestReport(experimentId); + if (Objects.isNull(latestReport)) { + return new HashMap<>(); + } Map params = new HashMap<>(); if (Objects.nonNull(latestReport)) { params.put("审核人员姓名", Optional.ofNullable(sysUserService.getById(latestReport.getAuditor())).map(SysUser::getRealname)