diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java
index 99e84519..240fa93a 100644
--- a/src/com/engine/organization/entity/company/bo/CompBO.java
+++ b/src/com/engine/organization/entity/company/bo/CompBO.java
@@ -33,7 +33,7 @@ public class CompBO {
             tree.setIsParent(false);
             tree.setIsVirtual("0");
             tree.setName(item.getSubCompanyName());
-            tree.setPid(item.getSupSubComId().toString());
+            tree.setPid(item.getSupSubComId() == null ? "0" :item.getSupSubComId().toString());
             tree.setSelected(false);
             tree.setType("1");
             tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
@@ -101,7 +101,7 @@ public class CompBO {
                         .subCompanyCode(e.getSubCompanyCode())
                         .subCompanyDesc(e.getSubCompanyDesc())
                         .subCompanyName(e.getSubCompanyName())
-                        .supSubComId(e.getSupSubComId())
+                        .supSubComId(e.getSupSubComId() == null ? 0 : e.getSupSubComId())
                         .supSubComName(null == poMaps.get(e.getSupSubComId()) ? "" : poMaps.get(e.getSupSubComId()).getSubCompanyName())
                         .showOrder(e.getShowOrder())
                         .canceled(null == e.getCanceled() ? 0 : e.getCanceled())
diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
index 7dae62d8..881632a5 100644
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@@ -167,7 +167,7 @@ public class DepartmentBO {
             tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
             tree.setSelected(false);
             tree.setType("2");
-            tree.setParentComp(item.getSubCompanyId1().toString());
+            tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString());
             tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue());
             return tree;
         }).collect(Collectors.toList());