Commit eef6a3503639d7e97402a457f74aa46bde765d06
1 parent
a4db67ef4c
Exists in
master
and in
1 other branch
儿童管理
Showing 1 changed file with 13 additions and 9 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
eef6a35
... | ... | @@ -393,15 +393,19 @@ |
393 | 393 | } |
394 | 394 | |
395 | 395 | if (null != nextDateStart && nextDateEnd != null) { |
396 | - if (c != null) | |
397 | - { | |
398 | - Criteria nc = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); | |
399 | - c.andOperator(nc); | |
400 | - } | |
401 | - else { | |
402 | - c = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); | |
403 | - } | |
404 | - condition.andCondition( new MongoCondition(c)); | |
396 | + | |
397 | + Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); | |
398 | + condition.andCondition(new MongoCondition(cr)); | |
399 | +// | |
400 | +// if (c != null) | |
401 | +// { | |
402 | +// Criteria nc = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); | |
403 | +// c.andOperator(nc); | |
404 | +// } | |
405 | +// else { | |
406 | +// c = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); | |
407 | +// } | |
408 | +// condition.andCondition( new MongoCondition(c)); | |
405 | 409 | } |
406 | 410 | |
407 | 411 | if (null != birthEnd) { |