jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 154bd7523a404968bbde7c7075269031b2db5fd1

Authored by liquanyu
1 parent 9fd4a89d58
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童查询条件修改

Showing 1 changed file with 6 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 154bd75
... ... @@ -979,7 +979,10 @@
979 979 MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS);
980 980 MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
981 981 if (c != null) {
982   - c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
  982 + //http://jira.healthbaby.com.cn/browse/WEB-2773
  983 + c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
  984 + c.getCriteriaObject().putAll(c1.getCriteria().getCriteriaObject());
  985 +// c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
983 986 } else {
984 987 c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
985 988 }
... ... @@ -994,6 +997,8 @@
994 997 }
995 998  
996 999 if (c != null) {
  1000 + System.out.println( c.getCriteriaObject().toString());
  1001 + System.out.println( condition.toMongoQuery().convertToMongoQuery().toString());
997 1002 return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
998 1003 }
999 1004 return condition.toMongoQuery();