From 7a9cd519e03dc3e3c33f6777fb2f1fcdd7693b92 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 15 Aug 2024 09:40:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(88633):=20=E6=A0=87=E5=87=86=E4=B8=BB?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsStandardMasterPlanServiceImpl.java    | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

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());
+                }
             }
         });
     }