|
|
|
@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
import java.util.Comparator;
|
|
|
|
|
import java.util.List;
|
|
|
|
@ -127,6 +128,22 @@ public class DeptController {
|
|
|
|
|
DeptListReqVO deptListReqVO = new DeptListReqVO();
|
|
|
|
|
deptListReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
|
|
|
|
|
List<DeptDO> deptDOList = deptService.getDeptList(deptListReqVO);
|
|
|
|
|
//将Dept转化为简单的Dept
|
|
|
|
|
List<DeptSimpleRespVO> simpleDeptList = new ArrayList<>();
|
|
|
|
|
simpleDeptList.addAll(DeptConvert.INSTANCE.convertList02(deptDOList));
|
|
|
|
|
deptDOList.forEach(deptDO -> {
|
|
|
|
|
List<AdminUserDO> adminUserList = userService.getUserListByDeptIds(Collections.singleton(deptDO.getId()));
|
|
|
|
|
for (AdminUserDO adminUserDO : adminUserList){
|
|
|
|
|
DeptSimpleRespVO deptSimpleRespVO = new DeptSimpleRespVO();
|
|
|
|
|
deptSimpleRespVO.setId(adminUserDO.getId());
|
|
|
|
|
deptSimpleRespVO.setParentId(adminUserDO.getDeptId());
|
|
|
|
|
deptSimpleRespVO.setName(adminUserDO.getNickname());
|
|
|
|
|
simpleDeptList.add(deptSimpleRespVO);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
List<AdminUserDO> adminUserDOList = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
//将list转为树状
|
|
|
|
|
List<DeptDO> list = deptService.buildTree(deptDOList,0);
|
|
|
|
|
//为部门list添加下级用户
|
|
|
|
|