Browse Source

Merge remote-tracking branch 'origin/v1.0' into v1.0

contract
Yen 2 years ago
parent
commit
28e3d861f1
  1. 8
      src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

8
src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@ -67,14 +67,14 @@ public class SysUserController {
} }
} }
List<SysUserSalesTreeVo> treeVoList = sysUsers.stream().map(sysUser->{ List<SysUserSalesTreeVo> treeVoList = sysUsers.stream().map(sysUser->{
SysDept sysDept = sysDeptService.getById(sysUser.getDeptId()); // SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
SysUserSalesTreeVo treeNode = CopierUtil.copy(sysUser,new SysUserSalesTreeVo()); SysUserSalesTreeVo treeNode = CopierUtil.copy(sysUser,new SysUserSalesTreeVo());
treeNode.setId(sysUser.getId()); treeNode.setId(sysUser.getId());
treeNode.setParentId(sysUser.getParentId()); treeNode.setParentId(sysUser.getParentId());
treeNode.setSort(0); treeNode.setSort(0);
if(sysDept!=null){ // if(sysDept!=null){
treeNode.setDeptName(sysDept.getName()); // treeNode.setDeptName(sysDept.getName());
} // }
return treeNode; return treeNode;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING); treeVoList = TreeUtil.buildByRecursive(treeVoList,TreeUtil.DEFAULT_PID_STRING);

Loading…
Cancel
Save