Merge branch 'feature/dxf' into develop

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

@@ -141,6 +141,10 @@ public class ChartServiceImpl extends Service implements ChartService {
 
         // 向下查询数据
         if (null != topChartPO) {
+            // 如果根结点是部门，顶层层级设置为1
+            if(topChartPO.getFtype().equals("2")){
+                topChartPO.setDepartmentDepth(1);
+            }
             findChildData(topChartPO, dataList, Integer.parseInt(depth), id, hideDepartment);
         }
 
@@ -1757,7 +1761,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                 }
             } else {
                 sql = "select " + dbType.concat("", "subcompanyid") + " as id, subcompanyid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompany where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcompanyid", "0") + " = " + subCompany +
-                        " union select " + dbType.concat("d", "subcompanyid") + "as id, subcompanyid as value, departmentname as title, subcompanyid as pId from jcl_chart_department where (canceled is null or canceled != '1') and (supdepartmentid is null or supdepartmentid =0) and " + dbType.ifNull("subcompanyid", "0") + " = " + subCompany;
+                        " union select " + dbType.concat("d", "departmentid") + "as id, departmentid as value, departmentname as title, subcompanyid as pId from jcl_chart_department where (canceled is null or canceled != '1') and (supdepartmentid is null or supdepartmentid =0) and " + dbType.ifNull("subcompanyid", "0") + " = " + subCompany;
                 if (isNotCurrentDimension) {
                     sql = "select " + dbType.concat("", "subcompanyvirtualid") + " as id, subcompanyvirtualid as value, subcompanyname as title, supsubcompanyid as pId from jcl_chart_subcompanyvirtual where (canceled is null or canceled != '1') and " + dbType.ifNull("supsubcompanyid", "0") + " = " + subCompany + " and companyid = '" + dimension + "' " +
                             " union select " + dbType.concat("d", "departmentvirtualid") + "as id, departmentvirtualid as value, departmentname as title, subcompanyid as pId from jcl_chart_departmentvirtual where (canceled is null or canceled != '1') and (supdepid is null or supdepid =0) and" + dbType.ifNull("subcompanyid", "0") + " = " + subCompany;