From eaca9535d5fb43c05cebce846946303c838428ee Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Feb 2023 14:41:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/util/saveimport/CompanyImport.java | 4 +++- .../organization/util/saveimport/DepartmentImport.java | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) 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 + "转换失败");