|
|
|
@ -466,9 +466,9 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
String sql = getDepartmentTreeSql(versionId, dimension, subCompany);
|
|
|
|
|
rs.executeQuery(sql);
|
|
|
|
|
while (rs.next()) {
|
|
|
|
|
departmentTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(versionId, dimension, rs.getString("id"))).build());
|
|
|
|
|
departmentTree.add(CompanyTreePO.builder().id(rs.getString("id")).pId(rs.getString("pId")).disabled(!rs.getString("id").startsWith("d")).value(rs.getString("value")).title(rs.getString("title")).isLeaf(judgeTreeLeaf(versionId, dimension, rs.getString("id"))).build());
|
|
|
|
|
}
|
|
|
|
|
result.put("companyTree", departmentTree);
|
|
|
|
|
result.put("departmentTree", departmentTree);
|
|
|
|
|
result.put("api_status", true);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|