Merge pull request 'bug' (#4) from feature/cl into develop

Reviewed-on: #4

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

@@ -340,7 +340,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
 
 
     private void findUserItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql, boolean expand) {
-        rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber,t.fobjid,fecid from jcl_org_map t " + whereSql + " and t.fparentid = " + id);
+        rs.executeQuery("select t.id, t.fname, t.ftype, t.fparentid,t.fleader, t.fleadername, t.fleaderimg, t.fleaderjob, t.fplan, t.fonjob, t.fnumber,t.fobjid,fecid from jcl_org_map t " + whereSql + " and t.fparentid = " + id);
         List<Map<String, Object>> currentList = new ArrayList<>();
         while (rs.next()) {
             Map<String, Object> item = new HashMap<>();
@@ -357,6 +357,7 @@ 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"));
+            item.put("fleader", rs.getString("fleader"));
             item.put("hasChildren", hasChildren(rs.getString("id"), false));
             currentList.add(item);
         }