BUG修复

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<Integer, List<SingleDeptTreeVO>> collects = singleDeptTreeVOS.stream().filter(item -> !parentComp.equals(item.getSubCompanyId1()) && 0 != item.getSupDepId()).collect(Collectors.groupingBy(SingleDeptTreeVO::getSupDepId));
+        Map<Integer, List<SingleDeptTreeVO>> 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());
     }

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -231,7 +231,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        return MenuBtn.getDatasHasCopy();
+        return MenuBtn.getDatasNoBtnColum();
     }
 
     @Override

src/com/engine/organization/service/impl/JobServiceImpl.java

@@ -203,7 +203,7 @@ public class JobServiceImpl extends Service implements JobService {
 
     @Override
     public Map<String, List<MenuBtn>> getHasRight() {
-        return MenuBtn.getDatasHasCopy();
+        return MenuBtn.getDatasNoBtnColum();
     }
 
     @Override