组织架构图字段对其

顺胜组织架构图V2
Administrator 1 year ago
parent 3cbb2100f3
commit b7a60f6b9e

@ -17,11 +17,11 @@ import java.util.List;
@NoArgsConstructor
public class DropTreeDataVO {
private String id;
private String value;
private String label;
private List<DropTreeDataVO> childrens;
private List<DropTreeDataVO> children;
}

@ -184,11 +184,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
while (rs.next()) {
String id = Util.null2String(rs.getString("id"));
DropTreeDataVO build = DropTreeDataVO.builder()
.id(getRandomData()+id)
.value(getRandomData()+id)
.label(Util.null2String(rs.getString("departmentmark")))
.build();
if (isVirtualSubDepartment(id,virtualType)) {
build.setChildrens(getVirtualSubDeptData(id,virtualType));
build.setChildren(getVirtualSubDeptData(id,virtualType));
}
voList.add(build);
}
@ -281,11 +281,11 @@ public List<DropTreeDataVO> selectVirtualTopTwo(String virtualType) {
rs.next();
String id = Util.null2String(rs.getString("id"));
build = DropTreeDataVO.builder()
.id(getRandomData()+id)
.value(getRandomData()+id)
.label(Util.null2String(rs.getString("departmentmark")))
.build();
if (isVirtualSubDepartment(id,virtualType)) {
build.setChildrens(getVirtualSubDeptData(id,virtualType));
build.setChildren(getVirtualSubDeptData(id,virtualType));
}
dataVOS.add(build);
@ -297,11 +297,11 @@ public List<DropTreeDataVO> selectVirtualTopTwo(String virtualType) {
rs.executeQuery("select departmentmark from hrmdepartmentvirtual where id = ? and virtualtype = ? order by showorder",departmentId,virtualType);
rs.next();
build = DropTreeDataVO.builder()
.id(getRandomData()+departmentId)
.value(getRandomData()+departmentId)
.label(Util.null2String(rs.getString("departmentmark")))
.build();
if (isVirtualSubDepartment(departmentId,virtualType)) {
build.setChildrens(getVirtualSubDeptData(departmentId,virtualType));
build.setChildren(getVirtualSubDeptData(departmentId,virtualType));
}
dataVOS.add(build);

Loading…
Cancel
Save