Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -254,9 +254,11 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 if (StringUtils.isNotBlank(excelInfo.getBankContractNo()) && StringUtils.isNotBlank(excelInfo.getRealReturnTime())) {
                     String bankContractNo = excelInfo.getBankContractNo();
                     String realReturnTime = excelInfo.getRealReturnTime();
-                    List<LoanRepaymentHistory> histories = baseMapper.selByBankNoAndActDate(bankContractNo, realReturnTime);
-                    if (!histories.isEmpty() || histories.size() > 0) {
-                        checkWord2.add("实还日期:" + realReturnTime + "、资方合同编号:" + bankContractNo);
+                    if (!realReturnTime.equals("error")) {
+                        List<LoanRepaymentHistory> histories = baseMapper.selByBankNoAndActDate(bankContractNo, realReturnTime);
+                        if (!histories.isEmpty() || histories.size() > 0) {
+                            checkWord2.add("实还日期:" + realReturnTime + "、资方合同编号:" + bankContractNo);
+                        }
                     }
                 }
             }