Commit aabacd644f49c7f6791239012cad5adbaae9cca0
1 parent
97d760b81d
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 10 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
aabacd6
| ... | ... | @@ -257,14 +257,18 @@ |
| 257 | 257 | */ |
| 258 | 258 | private PremaritalCheckup getPremaritalCheckup(ResidentsArchiveModel newModel) |
| 259 | 259 | { |
| 260 | - PremaritalCheckupQuery query = new PremaritalCheckupQuery(); | |
| 261 | - query.setParentId(newModel.getId()); | |
| 262 | - query.setYn(YnEnums.YES.getId()); | |
| 263 | - List<PremaritalCheckup> datas = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "created", Sort.Direction.DESC); | |
| 264 | - if (CollectionUtils.isNotEmpty(datas)) | |
| 260 | + if (newModel != null) | |
| 265 | 261 | { |
| 266 | - return datas.get(0); | |
| 262 | + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); | |
| 263 | + query.setParentId(newModel.getId()); | |
| 264 | + query.setYn(YnEnums.YES.getId()); | |
| 265 | + List<PremaritalCheckup> datas = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "created", Sort.Direction.DESC); | |
| 266 | + if (CollectionUtils.isNotEmpty(datas)) | |
| 267 | + { | |
| 268 | + return datas.get(0); | |
| 269 | + } | |
| 267 | 270 | } |
| 271 | + | |
| 268 | 272 | return null; |
| 269 | 273 | } |
| 270 | 274 |