|
|
@@ -2907,7 +2907,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
|
|
|
if(equalsMap.contains(ptlAgreementProductCostsAttrLink.getAttrCode())){
|
|
|
boolean b = Arrays.stream(split).anyMatch(value::equals);
|
|
|
returnBool.set(b);
|
|
|
- }else if(ptlAgreementProductCostsAttrLink.getAttrCode().equals("BrandandModel") && ptlAgreementProductCostsAttrLink.getOperator().equals("2")){
|
|
|
+ }else if((ptlAgreementProductCostsAttrLink.getAttrCode().equals("BrandandModel") || ptlAgreementProductCostsAttrLink.getAttrCode().equals("CarOwnerName"))
|
|
|
+ && ptlAgreementProductCostsAttrLink.getOperator().equals("2")){
|
|
|
//处理品牌型号 不包含的情况
|
|
|
boolean anyMatch = Arrays.stream(split)
|
|
|
.anyMatch(value::contains);
|