组织透视图，穿透BUG修复

src/com/engine/organization/entity/jingyou/JyChart.java

@@ -20,6 +20,7 @@ public class JyChart {
     private String fecid;
     private String fisvitual;
     private String expand;
+    private String uuid;
     private boolean hasChildren;
 
     private String fleadername;
@@ -38,6 +39,10 @@ public class JyChart {
         return rs;
     }
 
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
     public String getId() {
         return id;
     }
@@ -79,17 +84,17 @@ public class JyChart {
     }
 
     public String getFobjid() {
-        // 根据EcId获取聚才林ID
+        // 根据UUID获取聚才林ID
-        if (StringUtils.isNotBlank(fecid) && StringUtils.isNotBlank(id)) {
+        if (StringUtils.isNotBlank(uuid)) {
             if (id.startsWith("s_")) {
                 // 查询聚才林分部的ID
-                rs.executeQuery("select id from jcl_org_comp where ec_company = ?",fecid);
+                rs.executeQuery("select id from jcl_org_comp where uuid = ?",uuid);
                 if(rs.next()){
                     return rs.getString("id");
                 }
             } else if (id.startsWith("d_")) {
                 // 查询聚才林分部的ID
-                rs.executeQuery("select id from jcl_org_dept where ec_department = ?",fecid);
+                rs.executeQuery("select id from jcl_org_dept where uuid = ?",uuid);
                 if(rs.next()){
                     return rs.getString("id");
                 }

src/com/engine/organization/entity/jingyou/JyJobChart.java

@@ -35,6 +35,11 @@ public class JyJobChart extends JyChart {
         return "0";
     }
 
+    @Override
+    public String getFobjid() {
+        return super.getFecid();
+    }
+
     @Override
     public boolean equals(Object o) {
         return super.equals(o);

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

@@ -108,6 +108,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                     item.setFtype("0");
                     item.setFnumber(rs.getString("companycode"));
                     item.setFecid(rs.getString("id"));
+                    item.setUuid(rs.getString("uuid"));
                     item.setFisvitual("0");
                     item.setExpand("1");
                     chartList.add(item);
@@ -124,6 +125,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                     item.setFtype("1");
                     item.setFnumber(rs.getString("subcompanycode"));
                     item.setFecid(rs.getString("id"));
+                    item.setUuid(rs.getString("uuid"));
                     item.setFisvitual("0");
                     item.setExpand("1");
                     chartList.add(item);
@@ -158,6 +160,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                         item.setFtype("1");
                         item.setFnumber(rs.getString("subcompanycode"));
                         item.setFecid(rs.getString("id"));
+                        item.setUuid(rs.getString("uuid"));
                         item.setFisvitual("0");
                         item.setExpand("0");
                         chartList.add(item);
@@ -176,6 +179,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                         jyChart.setFtype("2");
                         jyChart.setFnumber(rs.getString("departmentcode"));
                         jyChart.setFecid(rs.getString("id"));
+                        jyChart.setUuid(rs.getString("uuid"));
                         jyChart.setFisvitual("0");
                         jyChart.setExpand("0");
                         chartList.add(jyChart);
@@ -227,6 +231,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                     item.setFtype("0");
                     item.setFnumber(rs.getString("companycode"));
                     item.setFecid(rs.getString("id"));
+                    item.setUuid(rs.getString("uuid"));
                     item.setFisvitual("0");
                     item.setExpand("1");
                     chartList.add(item);
@@ -243,6 +248,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                     item.setFtype("1");
                     item.setFnumber(rs.getString("subcompanycode"));
                     item.setFecid(rs.getString("id"));
+                    item.setUuid(rs.getString("uuid"));
                     item.setFisvitual("0");
                     item.setExpand("1");
                     chartList.add(item);
@@ -277,6 +283,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                         item.setFtype("1");
                         item.setFnumber(rs.getString("subcompanycode"));
                         item.setFecid(rs.getString("id"));
+                        item.setUuid(rs.getString("uuid"));
                         item.setFisvitual("0");
                         item.setExpand("0");
                         chartList.add(item);
@@ -295,6 +302,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                         jyChart.setFtype("2");
                         jyChart.setFnumber(rs.getString("departmentcode"));
                         jyChart.setFecid(rs.getString("id"));
+                        jyChart.setUuid(rs.getString("uuid"));
                         jyChart.setFisvitual("0");
                         jyChart.setExpand("0");
                         chartList.add(jyChart);
@@ -314,6 +322,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
                         jyChart.setFtype("3");
                         jyChart.setFnumber(rs.getString("job_no"));
                         jyChart.setFecid(rs.getString("id"));
+                        jyChart.setUuid(rs.getString("uuid"));
                         jyChart.setFisvitual("0");
                         jyChart.setExpand("0");
                         chartList.add(jyChart);
@@ -343,6 +352,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
             item.setFtype("1");
             item.setFnumber(rs.getString("subcompanycode"));
             item.setFecid(rs.getString("id"));
+            item.setUuid(rs.getString("uuid"));
             item.setFisvitual("0");
             item.setExpand(currentLevel > 0 ? "1" : "0");
             subCompanyList.add(item);
@@ -369,6 +379,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
             item.setFtype("2");
             item.setFnumber(rs.getString("departmentcode"));
             item.setFecid(rs.getString("id"));
+            item.setUuid(rs.getString("uuid"));
             item.setFisvitual("0");
             item.setExpand(currentLevel > 0 ? "1" : "0");
             departmentList.add(item);
@@ -393,6 +404,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
             item.setFtype("1");
             item.setFnumber(rs.getString("subcompanycode"));
             item.setFecid(rs.getString("id"));
+            item.setUuid(rs.getString("uuid"));
             item.setFisvitual("0");
             item.setExpand(currentLevel > 0 ? "1" : "0");
             subCompanyList.add(item);
@@ -420,6 +432,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
             item.setFtype("2");
             item.setFnumber(rs.getString("departmentcode"));
             item.setFecid(rs.getString("id"));
+            item.setUuid(rs.getString("uuid"));
             item.setFisvitual("0");
             item.setExpand(currentLevel > 0 ? "1" : "0");
             departmentList.add(item);
@@ -445,6 +458,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
             item.setFtype("3");
             item.setFnumber(rs.getString("job_no"));
             item.setFecid(rs.getString("id"));
+            item.setUuid(rs.getString("uuid"));
             item.setFisvitual("0");
             item.setExpand(currentLevel > 0 ? "1" : "0");
             jobList.add(item);
@@ -471,6 +485,7 @@ public class JyChartServiceImpl extends Service implements OrgChartService {
             item.setFtype("4");
             item.setFnumber(rs.getString("hrmresource"));
             item.setFecid(rs.getString("id"));
+            item.setUuid(rs.getString("uuid"));
             item.setFisvitual("0");
             item.setExpand(currentLevel > 0 ? "1" : "0");
             resourceList.add(item);