|
|
|
@ -140,6 +140,7 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
if (!isRealDimension && "2".equals(topChartPO.getFtype())){
|
|
|
|
|
ChartDepartmentModeVO departmentModeVO = selectModeInfo(rs.getString("id"));
|
|
|
|
|
topChartPO.setColorCheck(departmentModeVO.getColorCheck());
|
|
|
|
|
topChartPO.setFleader(departmentModeVO.getLeaderName());
|
|
|
|
|
}
|
|
|
|
|
filterAndAddData(dataList, topChartPO, hideDepartment);
|
|
|
|
|
//dataList.add(topChartPO);
|
|
|
|
@ -220,6 +221,7 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
if (!isRealDimension && "2".equals(chartPO.getFtype())){
|
|
|
|
|
ChartDepartmentModeVO departmentModeVO = selectModeInfo(rs.getString("id"));
|
|
|
|
|
chartPO.setColorCheck(departmentModeVO.getColorCheck());
|
|
|
|
|
chartPO.setFleader(departmentModeVO.getLeaderName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1551,6 +1553,7 @@ public class ChartServiceImpl extends Service implements ChartService {
|
|
|
|
|
if (!isRealDimension && "2".equals(chartPO.getFtype())){
|
|
|
|
|
ChartDepartmentModeVO departmentModeVO = selectModeInfo(recordSet.getString("id"));
|
|
|
|
|
chartPO.setColorCheck(departmentModeVO.getColorCheck());
|
|
|
|
|
chartPO.setFleader(departmentModeVO.getLeaderName());
|
|
|
|
|
}
|
|
|
|
|
// 小于、等于所选层级元素展开
|
|
|
|
|
chartPO.setExpand(inDepth(selectDepth, chartPO.getDepartmentDepth()) ? "1" : "0");
|
|
|
|
|