shiyang / regional-platform

Download as
Browse Code »

Commit f52409e88251b3d415a2c4cf86de89d3a64a41e3

Authored by baohanddd
2 parents 06b5537fa6 cc6ce903f7
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java View file @ f52409e
... ... @@ -279,7 +279,7 @@
279 279  
280 280 /**
281 281 * 发送时间类型
282   - * @param serviceObjId 服务短信
  282 + * @param serviceObjId 服务对象
283 283 * @param freq 发送频次
284 284 * @return
285 285 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ f52409e
... ... @@ -356,8 +356,8 @@
356 356  
357 357 if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) {
358 358 BabyModelQuery babyQuery = new BabyModelQuery();
359   - babyQuery.setMcertNo(cardNo);
360   - babyQuery.setVcCardNo(vcCardNo);
  359 + babyQuery.setMcertNo(StringUtils.isEmpty(cardNo) ? null : cardNo);
  360 + babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
361 361 babyQuery.setYn(YnEnums.YES.getId());
362 362  
363 363 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);