Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r15043 -r15333
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 15043)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 15333)
@@ -297,8 +297,10 @@
 			if (StringUtils.isNotBlank(companyId)
 					&& !OrgUnit.THTreeNodeRootId.toString().equals(companyId)) {
 				THTreeNode thTreeNode = getOrgUnitByCode(companyId);
-				childrean = new ArrayList<THTreeNode>();
-				childrean.add(thTreeNode);
+				if(thTreeNode != null){
+					childrean = new ArrayList<THTreeNode>();
+					childrean.add(thTreeNode);
+				}
 			} else {
 				childrean = thTreeNodeManager.findChildrenByParentId(
 						OrgUnit.class.getName(), parentId);
@@ -308,7 +310,7 @@
 					OrgUnit.class.getName(), parentId);
 		}
 
-		if (childrean != null) {
+		if (CollectionUtils.isNotEmpty(childrean)) {
 			for (THTreeNode thTreeNode : childrean) {
 				ExtTreeNode extTreeNode = new ExtTreeNode();