From 559ea407abffee8a208fd934b223c9b170cf35d6 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 7 Feb 2023 11:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=88=86=E6=9D=83=EF=BC=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8BUG=E4=BF=AE=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());