From 498029587e2823c96bc7aee2bb1f1a76ee6f19f8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 28 Aug 2018 17:18:39 +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 --- platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java | 2 +- 1 file changed, 1 insertion(+), 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 df5d580..04a66be 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 @@ -981,7 +981,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (c != null) { //http://jira.healthbaby.com.cn/browse/WEB-2773 c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); - c.getCriteriaObject().putAll(c1.getCriteria().getCriteriaObject()); + condition.andCondition(c1); // c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); } else { c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); -- 1.8.3.1