Merge branch 'feature/djp' into develop

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

@@ -204,7 +204,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
 
         // 获取根节点
         RecordSet rs = new RecordSet();
-        rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber from jcl_org_map t " + whereSql + whereItemSql);
+        rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fleader from jcl_org_map t " + whereSql + whereItemSql);
         List<Map<String, Object>> list = new ArrayList<>();
         String id = null;
         if(rs.next()) {
@@ -222,6 +222,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("hasChildren", hasChildren(rs.getString("id"), false));
             item.put("expand", "1");
             item.put("fnumber", rs.getString("fnumber"));
+            item.put("fleader", rs.getString("fleader"));
             list.add(item);
         }
 
@@ -244,7 +245,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         whereSql += " and fparentid in (" +ids+ ") ";
 
         RecordSet rs = new RecordSet();
-        rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber from jcl_org_map t " + whereSql );
+        rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber, t.fleader from jcl_org_map t " + whereSql );
         List<Map<String, Object>> currentList = new ArrayList<>();
         while(rs.next()) {
             Map<String, Object> item = new HashMap<>();
@@ -259,6 +260,7 @@ 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));
+            item.put("fleader", rs.getString("fleader"));
             currentList.add(item);
         }