|
@@ -92,7 +92,7 @@ public class SysUserController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 获取子节点
|
|
|
+ * 递归获取子节点
|
|
|
*
|
|
|
* @param dept 部门
|
|
|
* @return
|
|
@@ -102,28 +102,18 @@ public class SysUserController extends BaseController {
|
|
|
vo.setId(dept.getDeptId());
|
|
|
vo.setLabel(dept.getDeptName());
|
|
|
vo.setDisabled(true);
|
|
|
- List<SysDept> childrenList = dept.getChildren();
|
|
|
+
|
|
|
List<UserTreeVO> children = new ArrayList<>();
|
|
|
- for (SysDept d : childrenList) {
|
|
|
- UserTreeVO childVO = new UserTreeVO();
|
|
|
- childVO.setId(d.getDeptId());
|
|
|
- childVO.setLabel(d.getDeptName());
|
|
|
- childVO.setDisabled(true);
|
|
|
- children.add(childVO);
|
|
|
- List<UserTreeVO> cc = new ArrayList<>();
|
|
|
- for (SysDept dd : d.getChildren()) {
|
|
|
- cc.add(getChildren(dd));
|
|
|
- }
|
|
|
- childVO.setChildren(cc);
|
|
|
- }
|
|
|
- List<SysUser> userList = userService.selectUserListByDeptId(dept.getDeptId());
|
|
|
- for (SysUser u : userList) {
|
|
|
+
|
|
|
+ dept.getChildren().forEach(d -> children.add(getChildren(d)));
|
|
|
+
|
|
|
+ userService.selectUserListByDeptId(dept.getDeptId()).forEach(u -> {
|
|
|
UserTreeVO childVO = new UserTreeVO();
|
|
|
childVO.setId(u.getUserId());
|
|
|
childVO.setLabel(u.getNickName());
|
|
|
childVO.setDisabled(false);
|
|
|
children.add(childVO);
|
|
|
- }
|
|
|
+ });
|
|
|
|
|
|
vo.setChildren(children);
|
|
|
return vo;
|