diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index cce5b0d..b21e5f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -279,7 +279,7 @@ public class EnumsController { /** * 发送时间类型 - * @param serviceObjId 服务短信 + * @param serviceObjId 服务对象 * @param freq 发送频次 * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 480e99f..741bdbd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -356,8 +356,8 @@ public class BabyCheckFacade { if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) { BabyModelQuery babyQuery = new BabyModelQuery(); - babyQuery.setMcertNo(cardNo); - babyQuery.setVcCardNo(vcCardNo); + babyQuery.setMcertNo(StringUtils.isEmpty(cardNo) ? null : cardNo); + babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); babyQuery.setYn(YnEnums.YES.getId()); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);