liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!48 部门BUG修复 

Merge pull request !48 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-06-02 05:39:57 +00:00 committed by Gitee
parent 01fb393b1c 076d099715
commit 519eb0d7b4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/engine/organization/entity/department/bo/DepartmentBO.java
View File

@ -82,12 +82,13 @@ public class DepartmentBO {
.deptNo(param.getDeptNo()) .deptNo(param.getDeptNo())
.deptName(param.getDepartmentName()) .deptName(param.getDepartmentName())
.deptNameShort(param.getDeptNameShort()) .deptNameShort(param.getDeptNameShort())
.parentComp(null==param.getParentComp()?param.getSubcompanyid1():param.getParentComp()) .parentComp(null == param.getParentComp() ? param.getSubcompanyid1() : param.getParentComp())
.parentDept(null==param.getParentDept()?param.getDepartmentid():param.getParentDept()) .parentDept(null == param.getParentDept() ? param.getDepartmentid() : param.getParentDept())
.deptPrincipal(param.getDeptPrincipal()) .deptPrincipal(param.getDeptPrincipal())
.showOrder(param.getShowOrder()) .showOrder(param.getShowOrder())
.forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1) .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1)
.description(param.getDescription()).deleteType(0) .description(param.getDescription())
.deleteType(0)
.createTime(new Date()) .createTime(new Date())
.updateTime(new Date()) .updateTime(new Date())
.creator(employeeId) .creator(employeeId)
@ -100,7 +101,16 @@ public class DepartmentBO {
return Collections.emptyList(); return Collections.emptyList();
} }
List<SingleDeptTreeVO> 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<SingleDeptTreeVO> 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<Long, List<SingleDeptTreeVO>> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getParentComp()) && null != item.getParentDept()).collect(Collectors.groupingBy(SingleDeptTreeVO::getParentDept)); Map<Long, List<SingleDeptTreeVO>> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getParentComp()) && null != item.getParentDept()).collect(Collectors.groupingBy(SingleDeptTreeVO::getParentDept));

1
src/com/engine/organization/mapper/department/DepartmentMapper.xml
View File

@ -31,6 +31,7 @@
t.parent_dept, t.parent_dept,
t.dept_principal, t.dept_principal,
t.show_order, t.show_order,
t.description,
t.forbidden_tag t.forbidden_tag
</sql> </sql>