From e45ff3daa34faa9616560139ee113acedadb73c8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 17 Nov 2022 17:02:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5BUG=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ImportCommonServiceImpl.java | 18 ++++++++++++++++++ .../util/saveimport/PostInfoImportUtil.java | 4 +++- .../util/saveimport/StaffInfoImportUtil.java | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java index 0e616815..98d15b15 100644 --- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java @@ -687,6 +687,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); Long parentCompanyId = null; @@ -892,6 +895,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); Long parentCompanyId = null; @@ -1126,6 +1132,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); Long parentCompanyId = null; @@ -1388,6 +1397,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); Long parentCompanyId = null; @@ -1665,6 +1677,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); SchemePO schemePO = new SchemePO(); @@ -2273,6 +2288,9 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ */ private boolean hasSameName(JclImportHistoryDetailPO historyDetailPO, String cellValue) { String operateDetail = ""; + if (StringUtils.isBlank(cellValue)) { + return false; + } List resourceIds = MapperProxyFactory.getProxy(EmployeeMapper.class).getResourceIdsByName(cellValue); if (CollectionUtils.isEmpty(resourceIds)) { operateDetail = "[" + cellValue + "]未找到对应人员"; diff --git a/src/com/engine/organization/util/saveimport/PostInfoImportUtil.java b/src/com/engine/organization/util/saveimport/PostInfoImportUtil.java index 7a94e567..1aaca042 100644 --- a/src/com/engine/organization/util/saveimport/PostInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/PostInfoImportUtil.java @@ -4,7 +4,6 @@ import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO; import com.engine.organization.entity.postion.po.PostInfoPO; import com.engine.organization.entity.postion.po.PostPO; -import com.engine.organization.entity.staff.po.StaffPlanPO; import com.engine.organization.mapper.post.PostInfoMapper; import com.engine.organization.mapper.post.PostMapper; import com.engine.organization.util.OrganizationAssert; @@ -66,6 +65,9 @@ public class PostInfoImportUtil { historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); PostInfoPO postInfoPO = null; diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java index fbc9770c..d3936eb9 100644 --- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java @@ -78,6 +78,9 @@ public class StaffInfoImportUtil { historyDetailPO = new JclImportHistoryDetailPO(); historyDetailPO.setPid(importHistoryId); XSSFRow row = sheetAt.getRow(i); + if (null == row) { + continue; + } // 组装待处理数据 Map map = new HashMap<>(); Long parentCompanyId = null;