785834757 пре 1 година
родитељ
комит
e4331c2bbe

+ 11 - 2
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -2873,7 +2873,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                     .findFirst()
                     .get();
 
-            useFlag = attrEqual(ptlAgreementProductCostsAttrLink, ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
+            if(!Objects.isNull(ruleAttrMappingVo.getValue())) {
+                useFlag = attrEqual(ptlAgreementProductCostsAttrLink, ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
+            }else{
+                useFlag = false;
+            }
+
             if (!useFlag) {
                 log.debug("检验的值:" + ptlAgreementProductCostsAttrLink.getMin());
                 log.debug("传入的值:" + ruleAttrMappingVo.getValue());
@@ -2952,7 +2957,11 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                     ruleAttrMappingVo.setValue(ptlAgreementUndwrtRulesDictLabal.getCode());
                 }
             }
-            useFlag = attrEqual(ptlAgreementUndwrtRulesAttrLinks.get(i), ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
+            if(!Objects.isNull(ruleAttrMappingVo.getValue())) {
+                useFlag = attrEqual(ptlAgreementUndwrtRulesAttrLinks.get(i), ptlAgreementUndwrtRulesAttr, ruleAttrMappingVo.getValue());
+            }else{
+                useFlag = false;
+            }
             if (useFlag) {
                 return true;
             } else {