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();