|
|
|
@ -129,8 +129,7 @@ public class DeptController {
|
|
|
|
|
deptListReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
|
|
|
|
|
List<DeptDO> deptDOList = deptService.getDeptList(deptListReqVO);
|
|
|
|
|
//将Dept转化为简单的Dept
|
|
|
|
|
List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>();
|
|
|
|
|
simpleDeptList.addAll(DeptConvert.INSTANCE.convertList02(deptDOList));
|
|
|
|
|
List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>(DeptConvert.INSTANCE.convertList02(deptDOList));
|
|
|
|
|
deptDOList.forEach(deptDO -> {
|
|
|
|
|
List<AdminUserDO> adminUserList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId()));
|
|
|
|
|
for (AdminUserDO adminUserDO : adminUserList){
|
|
|
|
@ -142,8 +141,8 @@ public class DeptController {
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
//将list转为树状
|
|
|
|
|
// List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
|
|
|
|
|
return success(simpleDeptList);
|
|
|
|
|
List<DeptSimpleRespVO> list = deptService.buildTree(simpleDeptList,0);
|
|
|
|
|
return success(list);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|