fix: fnumber问题

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

@@ -99,7 +99,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
 
         // 获取根节点
         RecordSet rs = new RecordSet();
-        rs.executeQuery("select id, fname, ftype, fparentid from jcl_org_map " + whereSql + whereItemSql);
+        rs.executeQuery("select id, fname, ftype, fparentid, fnumber from jcl_org_map " + whereSql + whereItemSql);
         List<Map<String, Object>> list = new ArrayList<>();
         String id = null;
         if(rs.next()) {
@@ -108,6 +108,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("id", rs.getString("id"));
             item.put("fname", rs.getString("fname"));
             item.put("ftype", rs.getString("ftype"));
+            item.put("fnumber", rs.getString("fnumber"));
             item.put("parentId", null);
             item.put("expand", "1");
             item.put("hasChildren", hasChildren(rs.getString("id"), true));
@@ -126,7 +127,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
     }
 
     private void findCompanyItemByParantId(String id, int currentLevel, String level, RecordSet rs, List<Map<String, Object>> list, String whereSql, boolean expand) {
-        rs.executeQuery("select id, fname, ftype, fparentid from jcl_org_map " + whereSql + " and fparentid = " + id);
+        rs.executeQuery("select id, fname, ftype, fparentid, fnumber from jcl_org_map " + whereSql + " and fparentid = " + id);
         List<Map<String, Object>> currentList = new ArrayList<>();
         while(rs.next()) {
             Map<String, Object> item = new HashMap<>();
@@ -134,6 +135,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("fname", rs.getString("fname"));
             item.put("ftype", rs.getString("ftype"));
             item.put("parentId", rs.getString("fparentid"));
+            item.put("fnumber", rs.getString("fnumber"));
             item.put("expand", expand ? "1" : "0");
             item.put("hasChildren", hasChildren(rs.getString("id"), true));
             currentList.add(item);
@@ -189,7 +191,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 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 from jcl_org_map t " + whereSql + whereItemSql);
         List<Map<String, Object>> list = new ArrayList<>();
         String id = null;
         if(rs.next()) {
@@ -206,6 +208,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("fonjob", rs.getString("fonjob"));
             item.put("hasChildren", hasChildren(rs.getString("id"), false));
             item.put("expand", "1");
+            item.put("fnumber", rs.getString("fnumber"));
             list.add(item);
         }
 
@@ -326,7 +329,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         whereSql += " and fparentid in (" +ids+ ") ";
 
         RecordSet rs = new RecordSet();
-        rs.executeQuery("select id, fname, ftype, fparentid from jcl_org_map " + whereSql);
+        rs.executeQuery("select id, fname, ftype, fparentid, fnumber from jcl_org_map " + whereSql);
         List<Map<String, Object>> currentList = new ArrayList<>();
         while(rs.next()) {
             Map<String, Object> item = new HashMap<>();
@@ -334,6 +337,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("fname", rs.getString("fname"));
             item.put("ftype", rs.getString("ftype"));
             item.put("parentId", rs.getString("fparentid"));
+            item.put("fnumber", rs.getString("fnumber"));
             item.put("hasChildren", hasChildren(rs.getString("id"), true));
             currentList.add(item);
         }