From 076d0997151cccd213df4703f9a63ab78c0244ff Mon Sep 17 00:00:00 2001 From: dxfeng Date: Thu, 2 Jun 2022 13:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/department/bo/DepartmentBO.java | 18 ++++++++++++++---- .../mapper/department/DepartmentMapper.xml | 1 + 2 files changed, 15 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 d4c55adb..8e8e957d 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -82,12 +82,13 @@ public class DepartmentBO { .deptNo(param.getDeptNo()) .deptName(param.getDepartmentName()) .deptNameShort(param.getDeptNameShort()) - .parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp()) - .parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept()) + .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp()) + .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept()) .deptPrincipal(param.getDeptPrincipal()) .showOrder(param.getShowOrder()) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) - .description(param.getDescription()).deleteType(0) + .description(param.getDescription()) + .deleteType(0) .createTime(new Date()) .updateTime(new Date()) .creator(employeeId) @@ -100,7 +101,16 @@ public class DepartmentBO { return Collections.emptyList(); } - List singleDeptTreeVOS = departmentPOs.stream().map(e -> SingleDeptTreeVO.builder().id(e.getId()).deptName(e.getDeptName()).parentComp(e.getParentComp()).parentDept(e.getParentDept()).parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue())).deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())).build()).collect(Collectors.toList()); + List singleDeptTreeVOS = departmentPOs.stream().map(e -> + SingleDeptTreeVO + .builder() + .id(e.getId()) + .deptName(e.getDeptName()) + .parentComp(e.getParentComp()) + .parentDept(e.getParentDept()) + .parentDeptName(e.getParentDept() == null ? "" : getDeptNameById(e.getParentDept().intValue())) + .deptPrincipalName(getEmployeeNameById(e.getDeptPrincipal())) + .build()).collect(Collectors.toList()); //获取非一级部门 Map> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getParentComp()) && null != item.getParentDept()).collect(Collectors.groupingBy(SingleDeptTreeVO::getParentDept)); diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index 1e5b00a9..ad8540c0 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -31,6 +31,7 @@ t.parent_dept, t.dept_principal, t.show_order, + t.description, t.forbidden_tag