Commit ee7417b7e0a1372e993f2e1e9ae71787c6c07a7c
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
ee7417b
| ... | ... | @@ -981,7 +981,7 @@ |
| 981 | 981 | if (c != null) { |
| 982 | 982 | //http://jira.healthbaby.com.cn/browse/WEB-2773 |
| 983 | 983 | c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); |
| 984 | - c.getCriteriaObject().putAll(c1.getCriteria().getCriteriaObject()); | |
| 984 | + condition.andCondition(c1); | |
| 985 | 985 | // c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); |
| 986 | 986 | } else { |
| 987 | 987 | c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); |