From a1f2c9d1ac5093148de795ce2dba26de6e5d9ccc Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 8 Dec 2022 11:24:48 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/department/bo/DepartmentBO.java | 4 ++-- .../organization/service/impl/DepartmentServiceImpl.java | 2 +- src/com/engine/organization/service/impl/JobServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 668b35c7..9d6155db 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -114,11 +114,11 @@ public class DepartmentBO { .departmentMark(e.getDepartmentMark()) .subCompanyId1(e.getSubCompanyId1()) .supDepId(e.getSupDepId()) - .supDepName(e.getSupDepId() == 0 ? "" : getDeptNameById(e.getSupDepId())) + .supDepName(null == e.getSupDepId() || e.getSupDepId() == 0 ? "" : getDeptNameById(e.getSupDepId())) //.deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())) .build()).collect(Collectors.toList()); //获取非一级部门 - Map> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getSubCompanyId1()) && 0 != item.getSupDepId()).collect(Collectors.groupingBy(SingleDeptTreeVO::getSupDepId)); + Map> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getSubCompanyId1()) && null != item.getSupDepId() && 0 != item.getSupDepId()).collect(Collectors.groupingBy(SingleDeptTreeVO::getSupDepId)); return singleDeptTreeVOS.stream().peek(e -> e.setChildren(collects.get(e.getId()))).filter(item -> parentComp.equals(item.getSubCompanyId1())).collect(Collectors.toList()); } diff --git a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java index de15812f..f0e63d6c 100644 --- a/src/com/engine/organization/service/impl/DepartmentServiceImpl.java +++ b/src/com/engine/organization/service/impl/DepartmentServiceImpl.java @@ -231,7 +231,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService @Override public Map> getHasRight() { - return MenuBtn.getDatasHasCopy(); + return MenuBtn.getDatasNoBtnColum(); } @Override diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 4888d5df..a624d4d2 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -203,7 +203,7 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map> getHasRight() { - return MenuBtn.getDatasHasCopy(); + return MenuBtn.getDatasNoBtnColum(); } @Override