Merge branch 'master' into dev

src/main/java/com/supervision/police/service/impl/ModelServiceImpl.java

@@ -376,8 +376,8 @@ public class ModelServiceImpl implements ModelService {
                 }
             }
         }
-        //如果关系判断要求“不存在”，则判断count是否为0，如果关系判断要求“存在”，则判断count是否大于value
-        if ((ruleCondition.getRelationalSymbol().equals("4") && count == 0) || (StringUtils.isNotEmpty(ruleCondition.getOperator()) && StringUtils.isNotEmpty(ruleCondition.getValue()) && CalculationUtil.evaluateExpression(String.valueOf(count), ruleCondition.getOperator(), ruleCondition.getValue()))) {
+        //如果关系判断要求“不存在”，则判断条数需要大于0，如果关系判断要求“存在”，则判断count是否大于value
+        if ((ruleCondition.getRelationalSymbol().equals("4") && count > 0) || ruleCondition.getRelationalSymbol().equals("3") && StringUtils.isNotEmpty(ruleCondition.getOperator()) && StringUtils.isNotEmpty(ruleCondition.getValue()) && CalculationUtil.evaluateExpression(String.valueOf(count), ruleCondition.getOperator(), ruleCondition.getValue())) {
             flag = true;
         }
         modelAtomicResultService.saveOrUpdate(atomicResult);