diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
index e85c4e5e..63590b1e 100644
--- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
@@ -330,19 +330,22 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("fonjob", rs.getString("fonjob"));
             item.put("fnumber", rs.getString("fnumber"));
             item.put("hasChildren", hasChildren(rs.getString("id"), false));
-            JclOrgMap jclOrgMap = getBmfzrInfo(rs.getString("fleader"));
-            item.put("fleader", jclOrgMap.getFLeader()==null?"":String.valueOf(jclOrgMap.getFLeader()));
-            item.put("fleaderimg", jclOrgMap.getFLeaderImg());
-            item.put("fleadername", jclOrgMap.getFLeaderName()==null?"":jclOrgMap.getFLeaderName());
-            item.put("fleaderjob", jclOrgMap.getFLeaderJob());
-            item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
-            item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
-//            item.put("fleader", rs.getString("fleader"));
-//            item.put("fleaderimg", rs.getString("fleaderimg"));
-//            item.put("fleadername", rs.getString("fleadername"));
-//            item.put("fleaderjob", rs.getString("fleaderjob"));
-//            item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
-//            item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
+            if (rs.getString("ftype").equals("2")) {
+                JclOrgMap jclOrgMap = getBmfzrInfo(rs.getString("fleader"));
+                item.put("fleader", jclOrgMap.getFLeader() == null ? "" : String.valueOf(jclOrgMap.getFLeader()));
+                item.put("fleaderimg", jclOrgMap.getFLeaderImg());
+                item.put("fleadername", jclOrgMap.getFLeaderName() == null ? "" : jclOrgMap.getFLeaderName());
+                item.put("fleaderjob", jclOrgMap.getFLeaderJob());
+                item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
+                item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
+            } else {
+                item.put("fleader", rs.getString("fleader"));
+                item.put("fleaderimg", rs.getString("fleaderimg"));
+                item.put("fleadername", rs.getString("fleadername"));
+                item.put("fleaderjob", rs.getString("fleaderjob"));
+                item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
+                item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
+            }
             item.put("fobjid", rs.getString("fobjid"));
             item.put("fisvitual", rs.getString("fisvitual"));
             currentList.add(item);
@@ -424,19 +427,22 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("expand", expand ? "1" : "0");
             item.put("fobjid", rs.getString("fobjid"));
             item.put("fecid", rs.getString("fecid"));
-            JclOrgMap jclOrgMap = getBmfzrInfo(rs.getString("fleader"));
-            item.put("fleader", jclOrgMap.getFLeader()==null?"":String.valueOf(jclOrgMap.getFLeader()));
-            item.put("fleaderimg", jclOrgMap.getFLeaderImg());
-            item.put("fleadername", jclOrgMap.getFLeaderName()==null?"":jclOrgMap.getFLeaderName());
-            item.put("fleaderjob", jclOrgMap.getFLeaderJob());
-            item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
-            item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
-//            item.put("fleadername", rs.getString("fleadername"));
-//            item.put("fleaderimg", rs.getString("fleaderimg"));
-//            item.put("fleaderjob", rs.getString("fleaderjob"));
-//            item.put("fleader", rs.getString("fleader"));
-//            item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
-//            item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
+            if (rs.getString("ftype").equals("2")) {
+                JclOrgMap jclOrgMap = getBmfzrInfo(rs.getString("fleader"));
+                item.put("fleader", jclOrgMap.getFLeader() == null ? "" : String.valueOf(jclOrgMap.getFLeader()));
+                item.put("fleaderimg", jclOrgMap.getFLeaderImg());
+                item.put("fleadername", jclOrgMap.getFLeaderName() == null ? "" : jclOrgMap.getFLeaderName());
+                item.put("fleaderjob", jclOrgMap.getFLeaderJob());
+                item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
+                item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
+            } else {
+                item.put("fleader", rs.getString("fleader"));
+                item.put("fleaderimg", rs.getString("fleaderimg"));
+                item.put("fleadername", rs.getString("fleadername"));
+                item.put("fleaderjob", rs.getString("fleaderjob"));
+                item.put("fleaderlv", convertLevel(rs.getString("fleaderlv")));
+                item.put("fleaderst", convertGrade(rs.getString("fleaderst")));
+            }
             item.put("fisvitual", rs.getString("fisvitual"));
             item.put("hasChildren", hasChildren(rs.getString("id"), false));
             currentList.add(item);