diff --git a/src/com/engine/organization/util/saveimport/CompanyImport.java b/src/com/engine/organization/util/saveimport/CompanyImport.java index bfd66af7..66b8854d 100644 --- a/src/com/engine/organization/util/saveimport/CompanyImport.java +++ b/src/com/engine/organization/util/saveimport/CompanyImport.java @@ -195,8 +195,10 @@ public class CompanyImport { try { if ("subcompanyname".equalsIgnoreCase(infoPO.getFieldName())) { reallyValue = cellValue; + } else if (StringUtils.isBlank(cellValue)) { + reallyValue = ""; } else { - reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true); + reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem()); } } catch (Exception e) { historyDetailPO.setOperateDetail(cellValue + "转换失败"); diff --git a/src/com/engine/organization/util/saveimport/DepartmentImport.java b/src/com/engine/organization/util/saveimport/DepartmentImport.java index bd31cc58..6f05cd62 100644 --- a/src/com/engine/organization/util/saveimport/DepartmentImport.java +++ b/src/com/engine/organization/util/saveimport/DepartmentImport.java @@ -124,8 +124,8 @@ public class DepartmentImport { value += SystemEnv.getHtmlLabelName(28576, user.getLanguage()); item.put("link", templatePath); } - if(3==i){ - value = value.replace("及显示顺序",""); + if (3 == i) { + value = value.replace("及显示顺序", ""); } item.put("value", value); itemList.add(item); @@ -206,8 +206,10 @@ public class DepartmentImport { try { if ("departmentmark".equalsIgnoreCase(infoPO.getFieldName()) || "subcompanyid1".equalsIgnoreCase(infoPO.getFieldName())) { reallyValue = cellValue; + } else if (StringUtils.isBlank(cellValue)) { + reallyValue = ""; } else { - reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), true); + reallyValue = HrmFieldManagerForService.getReallyFieldvalue(infoPO.getJsonObject(cellValue), null != infoPO.getIsSystem() && 1 == infoPO.getIsSystem()); } } catch (Exception e) { historyDetailPO.setOperateDetail(cellValue + "转换失败");