jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit a131e3b7d55475c6f0c9276d98ba4349c2dba07d

Authored by jiangjiazhi
2 parents c4e1cfd53a 4d816d001a
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-dal/src/main/java/com/lyms/platform/query/PersonModelQuery.java View file @ a131e3b
... ... @@ -46,10 +46,11 @@
46 46 public MongoQuery convertToQuery() {
47 47 MongoCondition condition = MongoCondition.newInstance();
48 48  
49   - if (null != cardNo && phone != null) {
50   - MongoCondition con1 = MongoCondition.newInstance("cardNo", cardNo, MongoOper.IS);
51   - MongoCondition con = MongoCondition.newInstance("phone", phone, MongoOper.IS);
52   - condition = condition.orCondition(new MongoCondition[]{con1, con});
  49 + if (null != cardNo) {
  50 + condition = condition.and("cardNo", cardNo, MongoOper.IS);
  51 + }
  52 + if (phone != null) {
  53 + condition = condition.and("phone", phone, MongoOper.IS);
53 54 }
54 55 if (!StringUtils.isEmpty(id)) {
55 56 condition = condition.and("id", id, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ a131e3b
... ... @@ -102,6 +102,7 @@
102 102 {
103 103 PersonModelQuery personModelQuery = new PersonModelQuery();
104 104 personModelQuery.setPhone(yunRequest.getPregnantPhone());
  105 + personModelQuery.setCardNo(yunRequest.getPregnantCertificateNum());
105 106 personModelQuery.setYn(YnEnums.YES.getId());
106 107 List<PersonModel> personModels = personService.queryPersons(personModelQuery);
107 108 PersonModel pmodel = new PersonModel();