Commit 3265c38c8df0137be7759a92833815aff16675a9
1 parent
de4f5796a5
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 7 additions and 3 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
3265c38
| ... | ... | @@ -1547,8 +1547,12 @@ |
| 1547 | 1547 | if (CollectionUtils.isNotEmpty(enableListNot)) { |
| 1548 | 1548 | condition = condition.and("enable", enableListNot, MongoOper.NIN); |
| 1549 | 1549 | } |
| 1550 | + Criteria cor5=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 | |
| 1550 | 1551 | if (null != highRiskInfos) { |
| 1551 | - condition = condition.and("highRiskInfo", highRiskInfos, MongoOper.IN); | |
| 1552 | + MongoCondition con = MongoCondition.newInstance(); | |
| 1553 | + MongoCondition con1 = MongoCondition.newInstance("qhdHighRiskInfo.id", highRiskInfos, MongoOper.IN); | |
| 1554 | + MongoCondition con2 = MongoCondition.newInstance("highRiskInfo", highRiskInfos, MongoOper.IN); | |
| 1555 | + cor5=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); | |
| 1552 | 1556 | } |
| 1553 | 1557 | if (null != weakSonInfos) { |
| 1554 | 1558 | condition = condition.and("weakSonInfo", weakSonInfos, MongoOper.IN); |
| 1555 | 1559 | |
| ... | ... | @@ -2062,9 +2066,9 @@ |
| 2062 | 2066 | * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题 |
| 2063 | 2067 | */ |
| 2064 | 2068 | if(c!=null){ |
| 2065 | - return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2,cor3,cor4)).toMongoQuery(); | |
| 2069 | + return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2,cor3,cor4,cor5)).toMongoQuery(); | |
| 2066 | 2070 | } |
| 2067 | - return new MongoCondition(cor.andOperator(condition.getCriteria(),cor2,cor3,cor4)).toMongoQuery(); | |
| 2071 | + return new MongoCondition(cor.andOperator(condition.getCriteria(),cor2,cor3,cor4,cor5)).toMongoQuery(); | |
| 2068 | 2072 | } |
| 2069 | 2073 | |
| 2070 | 2074 | public Boolean getFmDataStatu() { |