diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java index 247687d4..0e322182 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java @@ -660,7 +660,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId8", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId8", ossFile.getFileName()); + } } }); } @@ -684,7 +686,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId7", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId7", ossFile.getFileName()); + } } }); } @@ -708,11 +712,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId6", ossFile.getFileName()); - } - if (StringUtils.isNotBlank(v.getDeliverableFileId())){ - OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId62", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId6", ossFile.getFileName()); + } } }); } @@ -736,7 +738,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId5", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId5", ossFile.getFileName()); + } } }); } @@ -774,7 +778,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId1", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId1", ossFile.getFileName()); + } } }); } @@ -798,7 +804,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId4", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId4", ossFile.getFileName()); + } } }); } @@ -821,7 +829,9 @@ public class LawsStandardMasterPlanServiceImpl } if (StringUtils.isNotBlank(v.getDeliverableFileId())){ OSSFile ossFile = ossFileService.getById(v.getDeliverableFileId()); - lm.put("deliverableFileId3", ossFile.getFileName()); + if (!Objects.isNull(ossFile)){ + lm.put("deliverableFileId3", ossFile.getFileName()); + } } }); }