shiyang / regional-platform

Download as
Browse Code »

Commit 2d607cff5f47f0bd5cb9a65944542e445c150d68

Authored by landong2015
1 parent d862c836d4
Exists in master and in 1 other branch nobuildprocess

修改

Showing 1 changed file with 5 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 2d607cf
... ... @@ -377,11 +377,11 @@
377 377 result.setStreetRegisterId(model.getStreetRegisterId());
378 378 result.setAddressRegister(model.getAddressRegister());
379 379  
380   - result.setPastHistory(JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
381   - result.setFamilyHistory(JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
382   - result.setPersonalHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
383   - result.setYwgmHistory(JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
384   - result.setPresentHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
  380 + result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
  381 + result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
  382 + result.setPersonalHistory(model.getPresentHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
  383 + result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
  384 + result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
385 385  
386 386 result.setVcCardNo(model.getVcCardNo());
387 387 result.setBuildDoctor(model.getBuildDoctor());