diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 5bc7528..a0e2cc0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -124,9 +124,11 @@ public class BabyCheckController extends BaseController { @ResponseBody @TokenRequired public BaseObjectResponse queryChooseBabys(HttpServletRequest request, @RequestParam(required = false) String vcCardNo, - @RequestParam(required = false) String cardNo, String coupon, @RequestParam(required = false) String ynStatus) { + @RequestParam(required = false) String cardNo, + @RequestParam(required = false) String encoded, + String coupon, @RequestParam(required = false) String ynStatus) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon, ynStatus); + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo,encoded, loginState.getId(), coupon, ynStatus); } 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 5b6055a..13fa82a 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 @@ -1375,7 +1375,7 @@ public class BabyCheckFacade extends BaseServiceImpl { * @param coupon * @return */ - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon, String ynStatus) { + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo,String encoded, Integer userId, String coupon, String ynStatus) { Map map = new HashMap(); @@ -1394,10 +1394,11 @@ public class BabyCheckFacade extends BaseServiceImpl { boolean isBuild = false; List results = new ArrayList<>(); - if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)) { + if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)|| StringUtils.isNotEmpty(encoded) ) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); + babyQuery.setEncoded(StringUtils.isEmpty(encoded) ? null : encoded); if (StringUtils.isNotEmpty(ynStatus)) { babyQuery.setDataStatus(false); } else {