From 7cec99eb4b5d04bd6acbbe6f2f6c057b836a45de Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 23 Nov 2018 16:09:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 908f133..f6dcf57 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 @@ -256,7 +256,7 @@ public class ResidentsArchiveFacade{ if (CollectionUtils.isNotEmpty(modelList)){ ResidentsArchiveModel archiveModel = modelList.get(0); - if (archiveModel != null & StringUtils.isNotEmpty(addRequest.getPhone()) && !archiveModel.getPhone().equals(addRequest.getPhone()) ){ + if (archiveModel != null & StringUtils.isNotEmpty(addRequest.getPhone()) && archiveModel.getPhone() != null && !archiveModel.getPhone().equals(addRequest.getPhone()) ){ query.setCertificateNum(null); query.setPhone(addRequest.getPhone()); modelList = residentsArchiveService.queryResident(query); -- 1.8.3.1