Commit 3ed7fc10fb572dc286de91a6f1428b9e168a5968
1 parent
75c9707126
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 4 additions and 10 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
3ed7fc1
| ... | ... | @@ -2223,22 +2223,16 @@ |
| 2223 | 2223 | condition = condition.and("dataStatus", 1, MongoOper.NE); |
| 2224 | 2224 | } else { |
| 2225 | 2225 | List<MongoCondition> mongoCondits = new ArrayList<>(); |
| 2226 | - mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS))); | |
| 2227 | - mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); | |
| 2226 | + mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS)); | |
| 2227 | + mongoCondits.add(new MongoCondition("dataStatus", Arrays.asList(1,2), MongoOper.IN).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); | |
| 2228 | 2228 | condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); |
| 2229 | 2229 | } |
| 2230 | 2230 | } |
| 2231 | 2231 | } |
| 2232 | 2232 | |
| 2233 | 2233 | if (fmDataStatu != null && fmDataStatu == true) { |
| 2234 | -// condition = condition.and("dataStatus", 1, MongoOper.IS); | |
| 2235 | -// condition = condition.and("yn", 0, MongoOper.IS); | |
| 2236 | - List<MongoCondition> mongoCondits = new ArrayList<>(); | |
| 2237 | - mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS)); | |
| 2238 | - mongoCondits.add(new MongoCondition("yn", 0, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS))); | |
| 2239 | - | |
| 2240 | - condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); | |
| 2241 | - | |
| 2234 | + condition = condition.and("dataStatus", Arrays.asList(1,2), MongoOper.IN); | |
| 2235 | + condition = condition.and("yn", 0, MongoOper.IS); | |
| 2242 | 2236 | } |
| 2243 | 2237 | |
| 2244 | 2238 | if (null != babyWeightStart) { |