diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 648c966a..2ba9c2f3 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -148,7 +148,7 @@ public interface JobMapper { int selectByConditions(@Param("resourcePO") ResourcePO resourcePO); - int selectByE9(@Param("jobTitleName") String jobTitleName,@Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark); + Integer selectByE9(@Param("jobTitleName") String jobTitleName,@Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark); List listUsedId(); diff --git a/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java b/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java index 7387d6e1..9c38c75d 100644 --- a/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java +++ b/src/com/engine/organization/util/saveimport/JobInfoImportUtil.java @@ -185,7 +185,7 @@ public class JobInfoImportUtil { //1.岗位在所属职务下是否存在 jobTitleId = MapperProxyFactory.getProxy(JobMapper.class).selectByE9(jobTitleName, jobactivitymark, jobgroupremark); if (null == jobTitleId) { - historyDetailPO.setOperateDetail(cellValue + "在系统岗职位体系中未匹配到数据,请检查职务和类别是否正确"); + historyDetailPO.setOperateDetail("【"+cellValue+"】" + "在系统岗职位体系中未匹配到数据,请检查职务和类别是否正确"); historyDetailPO.setStatus("0"); OrgImportUtil.saveImportDetailLog(historyDetailPO); continue nextRow; @@ -207,7 +207,13 @@ public class JobInfoImportUtil { continue; } - String jobNo = jobTitlesComInfo.getJobTitlescode(String.valueOf(jobTitleId)) + "-" +departmentId; + String jobNo = ""; + + String jobTitlescode = jobTitlesComInfo.getJobTitlescode(String.valueOf(jobTitleId)); + if (!"".equals(jobTitlescode)) { + jobNo = jobTitlesComInfo.getJobTitlescode(String.valueOf(jobTitleId)) + "-" +departmentId; + } + JobPO jobPO = JobPO.builder() .jobNo(jobNo) .isKey(isKey)