Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -738,18 +738,18 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
         Sheet sheet = wb.getSheetAt(0);
         ReturnExcelFinVo importReturn = getSheetVal(sheet, resultCell, useOrgSid);
         list = importReturn.getInfos();
-        for (ExcelFinVo excelFinVo : list) {
+        /*for (ExcelFinVo excelFinVo : list) {
             String customerName = excelFinVo.getCustomerName();
             if (customerName.contains(excelFinVo.getVinNo().substring(0, excelFinVo.getVinNo().length() - 8))) {
                 customerName = customerName.substring(0, customerName.length() - 8);
                 excelFinVo.setCustomerName(customerName);
             }
             list2.add(excelFinVo);
-        }
+        }*/
         if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
             return rb.setMsg(importReturn.getCheckInfo());
         } else {
-            return rb.success().setData(list2).setMsg("成功导入数据，请点击确定按钮");
+            return rb.success().setData(list).setMsg("成功导入数据，请点击确定按钮");
         }
     }
 
@@ -836,9 +836,9 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
                 if (StringUtils.isBlank(excelFinVo.getTiredDeficiency())) {
                     checkWord.add("财务累欠金额不能为空");
                 }
-                if (!excelFinVo.getCustomerName().contains(excelFinVo.getVinNo())) {
+              /*  if (!excelFinVo.getCustomerName().contains(excelFinVo.getVinNo())) {
                     checkWord.add("财务中客户名称" + excelFinVo.getCustomerName() + "不正确,请检查");
-                }
+                }*/
                 List<LoanRepaymentScheduleDetailsVo> loanRepaymentScheduleDetailsVos = loanOverdueFinDetailsService.selectByCustomerNo(excelFinVo.getCustomerNo(), useOrgSid);
                 loanRepaymentScheduleDetailsVos.removeAll(Collections.singleton(null));
                 if (loanRepaymentScheduleDetailsVos.isEmpty()) {