!48 部门BUG修复

Merge pull request !48 from dxfeng/feature/dxf

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<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));
 

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
     </sql>