Merge remote-tracking branch 'origin/develop_master' into develop_master

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();