Browse Source

参保人员导入修改。

tomatozq 5 years ago
parent
commit
f2f693b79f

+ 6 - 3
picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -393,7 +393,7 @@ public class CompanyMemberController {
 
             List<DataDictionary> ddList = dataDictionaryService.findByCatalogName("证件类型");
 
-            for(int rowIndex=1 ; rowIndex<sheet1.getLastRowNum(); rowIndex++){
+            for(int rowIndex=1 ; rowIndex<=sheet1.getLastRowNum(); rowIndex++){
                 try {
                     String name = (String)poiUtils.getCellValue(sheetIndex,rowIndex,1);
                     String cardType = (String)poiUtils.getCellValue(sheetIndex,rowIndex,2);
@@ -521,12 +521,15 @@ public class CompanyMemberController {
                 //todo 只保留错误数据的sheet
                 int rowIndex = 1;
 
-                while(rowIndex!= sheet1.getLastRowNum()){
+                while(rowIndex<= sheet1.getLastRowNum()){
                     Cell cell = sheet1.getRow(rowIndex).getCell(validateColIndex);
 
                     if (cell==null || StringUtils.isEmpty(cell.getStringCellValue())){
                         sheet1.removeRow(sheet1.getRow(rowIndex));
-                        sheet1.shiftRows(rowIndex+1,sheet1.getLastRowNum(),-1); //删除后下面行上移,则不需要移动rowIndex
+
+                        if (rowIndex<sheet1.getLastRowNum()) {
+                            sheet1.shiftRows(rowIndex + 1, sheet1.getLastRowNum(), -1); //删除后下面行上移,则不需要移动rowIndex
+                        }
                     }
                     else {
                         rowIndex++;