diff --git a/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java b/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java index 0c049b99..dde271a5 100644 --- a/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java +++ b/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java @@ -107,7 +107,7 @@ public class HrmResourceImportAdaptUtil { Map> checkInfos = new HashMap<>(); - private final String[] checkKeys = new String[]{"login_id", "work_code"}; + private final String[] checkKeys = new String[]{"loginid", "workcode"}; private int accountTypeIndex = 50; private int accountTypeColumn = -1; @@ -475,13 +475,13 @@ public class HrmResourceImportAdaptUtil { } String val = ""; switch (key) { - case "login_id": + case "loginid": val = importParam.getLogin_id(); break; - case "work_code": + case "workcode": val = importParam.getWork_code(); break; - case "certificate_num": + case "certificatenum": val = importParam.getCertificate_num(); break; } @@ -534,15 +534,15 @@ public class HrmResourceImportAdaptUtil { String val = ""; String errorMsg = ""; switch (key) { - case "login_id": + case "loginid": val = Util.null2String(importParam.getLogin_id()).trim(); errorMsg = SystemEnv.getHtmlLabelName(520127, userlanguage); break; - case "work_code": + case "workcode": val = Util.null2String(importParam.getWork_code()).trim(); errorMsg = SystemEnv.getHtmlLabelName(520128, userlanguage); break; - case "certificate_num": + case "certificatenum": val = Util.null2String(importParam.getCertificate_num()).trim(); errorMsg = SystemEnv.getHtmlLabelName(83623, userlanguage); break; diff --git a/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java b/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java index c7557576..66b0b2f4 100644 --- a/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java +++ b/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java @@ -71,7 +71,7 @@ public class HrmResourceImportProcessUtil { Map> checkInfos = new HashMap<>(); - private final String[] checkKeys = new String[]{"login_id", "work_code"}; + private final String[] checkKeys = new String[]{"loginid", "workcode"}; private Map baseTypeMap; //基础信息自定义字段数据库类型与字段名称映射 @@ -1969,13 +1969,13 @@ public class HrmResourceImportProcessUtil { ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user); String relatedName = ""; switch (this.keyField) { - case "work_code": + case "workcode": relatedName = log.getWorkCode(); break; - case "login_id": + case "loginid": relatedName = log.getLoginid(); break; - case "last_name": + case "lastname": relatedName = log.getLastname(); break; } @@ -2009,15 +2009,15 @@ public class HrmResourceImportProcessUtil { String val = ""; String errorMsg = ""; switch (key) { - case "login_id": + case "loginid": val = Util.null2String(importParam.getLogin_id()).trim(); errorMsg = SystemEnv.getHtmlLabelName(522076, userlanguage); break; - case "work_code": + case "workcode": val = Util.null2String(importParam.getWork_code()).trim(); errorMsg = SystemEnv.getHtmlLabelName(520197, userlanguage); break; - case "certificate_num": + case "certificatenum": val = Util.null2String(importParam.getCertificate_num()).trim(); errorMsg = SystemEnv.getHtmlLabelName(83521, userlanguage); break;