From 154bd7523a404968bbde7c7075269031b2db5fd1 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 28 Aug 2018 17:07:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/BabyModelQuery.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 02ba4a1..df5d580 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -979,7 +979,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS); MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); if (c != null) { - c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); + //http://jira.healthbaby.com.cn/browse/WEB-2773 + c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); + c.getCriteriaObject().putAll(c1.getCriteria().getCriteriaObject()); +// c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); } else { c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); } @@ -994,6 +997,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if (c != null) { + System.out.println( c.getCriteriaObject().toString()); + System.out.println( condition.toMongoQuery().convertToMongoQuery().toString()); return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } return condition.toMongoQuery(); -- 1.8.3.1