Merge remote-tracking branch 'origin/master'

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

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