组织架构图根据showorder排序

顺胜组织架构图V2
Chengliang 2 years ago
parent 89ff0ea423
commit 2431ba5edc

@ -105,7 +105,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
boolean isExsit = selectIdsByRole(roleId, rolelevel); boolean isExsit = selectIdsByRole(roleId, rolelevel);
if (isExsit || (user.getUID() == 1)) { if (isExsit || (user.getUID() == 1)) {
//ShareHolder唯一 //ShareHolder唯一
rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid = 0 and virtualtype = ?",virtualType); rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid = 0 and virtualtype = ? order by showorder",virtualType);
rs.next(); rs.next();
String id = Util.null2String(rs.getString("id")); String id = Util.null2String(rs.getString("id"));
build = TreeDataVO.builder() build = TreeDataVO.builder()
@ -138,7 +138,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
private List<ChartChildrensVO> getVirtualSubDept(String supdepid,String virtualType) { private List<ChartChildrensVO> getVirtualSubDept(String supdepid,String virtualType) {
RecordSet rs = new RecordSet(); RecordSet rs = new RecordSet();
List<ChartChildrensVO> voList = new ArrayList<>(); List<ChartChildrensVO> voList = new ArrayList<>();
rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid <> '' and supdepid = ? and virtualtype = ?",supdepid,virtualType); rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid <> '' and supdepid = ? and virtualtype = ? order by showorder",supdepid,virtualType);
while (rs.next()) { while (rs.next()) {
String id = Util.null2String(rs.getString("id")); String id = Util.null2String(rs.getString("id"));
ChartChildrensVO build = ChartChildrensVO.builder() ChartChildrensVO build = ChartChildrensVO.builder()

Loading…
Cancel
Save