From 2d607cff5f47f0bd5cb9a65944542e445c150d68 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Fri, 2 Dec 2016 17:06:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ResidentsArchiveFacade.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 c244855..ffdb2c8 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 @@ -377,11 +377,11 @@ public class ResidentsArchiveFacade{ result.setStreetRegisterId(model.getStreetRegisterId()); result.setAddressRegister(model.getAddressRegister()); - result.setPastHistory(JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class)); - result.setFamilyHistory(JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class)); - result.setPersonalHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class)); - result.setYwgmHistory(JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class)); - result.setPresentHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class)); + result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class)); + result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class)); + result.setPersonalHistory(model.getPresentHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class)); + result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class)); + result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class)); result.setVcCardNo(model.getVcCardNo()); result.setBuildDoctor(model.getBuildDoctor()); -- 1.8.3.1