From aabacd644f49c7f6791239012cad5adbaae9cca0 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 22 Jun 2021 15:28:54 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/ResidentsArchiveFacade.java       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
index 5efdf58..70ff858 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
@@ -257,14 +257,18 @@ public class ResidentsArchiveFacade {
      */
     private PremaritalCheckup getPremaritalCheckup(ResidentsArchiveModel newModel)
     {
-        PremaritalCheckupQuery query = new PremaritalCheckupQuery();
-        query.setParentId(newModel.getId());
-        query.setYn(YnEnums.YES.getId());
-        List<PremaritalCheckup> datas = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "created", Sort.Direction.DESC);
-        if (CollectionUtils.isNotEmpty(datas))
+        if (newModel != null)
         {
-            return datas.get(0);
+            PremaritalCheckupQuery query = new PremaritalCheckupQuery();
+            query.setParentId(newModel.getId());
+            query.setYn(YnEnums.YES.getId());
+            List<PremaritalCheckup> datas = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "created", Sort.Direction.DESC);
+            if (CollectionUtils.isNotEmpty(datas))
+            {
+                return datas.get(0);
+            }
         }
+
         return null;
     }
 
-- 
1.8.3.1