From 559ea407abffee8a208fd934b223c9b170cf35d6 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Feb 2023 11:29:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=88=86=E6=9D=83?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/api/browser/service/impl/JobBrowserService.java | 2 +- .../engine/organization/entity/department/bo/DepartmentBO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/api/browser/service/impl/JobBrowserService.java b/src/com/api/browser/service/impl/JobBrowserService.java index a229bb30..d587948f 100644 --- a/src/com/api/browser/service/impl/JobBrowserService.java +++ b/src/com/api/browser/service/impl/JobBrowserService.java @@ -130,7 +130,7 @@ public class JobBrowserService extends BrowserService { // 分权 DetachUtil detachUtil = new DetachUtil(user); if (detachUtil.isDETACH()) { - sqlWhere += " AND t.parent_comp in (" + detachUtil.getJclRoleLevels() + ")"; + sqlWhere += " AND t.ec_company in (" + detachUtil.getJclRoleLevels() + ")"; } return sqlWhere; } diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 9468c5c9..6841a0d7 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -159,7 +159,7 @@ public class DepartmentBO { return ""; } String departmentPrincipal = MapperProxyFactory.getProxy(DepartmentMapper.class).getDepartmentPrincipal(id); - if (StringUtils.isBlank(departmentPrincipal)) { + if (StringUtils.isBlank(departmentPrincipal) || "$NULL$".equalsIgnoreCase(departmentPrincipal)) { return ""; } List collect = Arrays.stream(departmentPrincipal.split(",")).map(Long::parseLong).collect(Collectors.toList()); From eaca9535d5fb43c05cebce846946303c838428ee Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Feb 2023 14:41:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=83=A8=E3=80=81=E9=83=A8?= =?UTF-8?q?=E9=97=A8=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 + "转换失败");