From 7ede6c69afef25521bec9b09017ae902407523fc Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Tue, 7 Sep 2021 09:24:41 +0800
Subject: [PATCH] commit

---
 .../service/impl/ImportExcelServiceImpl.java                 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
index 45513ee0..c6635b30 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
@@ -488,6 +488,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         try {
             String[] sortAndNumberAndYear = importDto.getStandId().split("\\s+");
             sort = sortAndNumberAndYear[0];
+
             String[] numberAndYear = sortAndNumberAndYear[1].split("\\-");
             number=numberAndYear[0];
             year=numberAndYear[1];
@@ -495,7 +496,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         }catch (Exception e){
 
             System.out.println("id为"+importDto.getStandId()+"格式无法解析");
-            return null;
+//            return null;
         }
 
         SarStandardsInfo sarStandardsInfo = new SarStandardsInfo();
@@ -613,7 +614,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
         }catch (Exception e){
             System.out.println("id为"+importDto.getStandId()+"格式无法解析");
-            return null;
+//            return null;
         }
 
         SarBussionessStand sarBussionessStand = new SarBussionessStand();