|
@@ -152,23 +152,24 @@ public class EmployeeController extends BaseController {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if(sysUser != null && sysUser.getId() != null){
|
|
|
Employee employee = employeeService.get(sysUser.getId());
|
|
|
- employee.setOrganName(organizationService.getOrganName(employee.getOrganIdList()));
|
|
|
- employee.setRoles(employeeDao.queryUserRole(sysUser.getId()));
|
|
|
- employee.setContactAddress(employee.getContactAddress());
|
|
|
- employee.setPostalCode(employee.getPostalCode());
|
|
|
- employee.setDeptId(employee.getDeptId());
|
|
|
- employee.setDeptIds(employee.getDeptIds());
|
|
|
- employee.setPostIds(employee.getPostIds());
|
|
|
- employee.setBankCard(employee.getBankCard());
|
|
|
- employee.setOpenBankAddress(employee.getOpenBankAddress());
|
|
|
- employee.setPostDeptIds(employee.getPostDeptIds());
|
|
|
+ sysUser.setOrganName(organizationService.getOrganName(employee.getOrganIdList()));
|
|
|
+ sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
|
|
|
+ sysUser.setContactAddress(employee.getContactAddress());
|
|
|
+ sysUser.setPostalCode(employee.getPostalCode());
|
|
|
+ sysUser.setDeptId(employee.getDeptId());
|
|
|
+ sysUser.setDeptIds(employee.getDeptIds());
|
|
|
+ sysUser.setPostIds(employee.getPostIds());
|
|
|
+ sysUser.setBankCard(employee.getBankCard());
|
|
|
+ sysUser.setOpenBankAddress(employee.getOpenBankAddress());
|
|
|
+ sysUser.setPostDeptIds(employee.getPostDeptIds());
|
|
|
+ sysUser.setOrganIdList(employee.getOrganIdList());
|
|
|
|
|
|
List<SysEmployeePositionDto> sysEmployeePositionDtoList = sysEmployeePositionService.queryByUserId(sysUser.getId());
|
|
|
if(sysEmployeePositionDtoList != null && sysEmployeePositionDtoList.size() > 0){
|
|
|
- employee.setPositions(StringUtils.join(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getRoleId).collect(Collectors.toSet()),","));
|
|
|
- employee.setPositionName(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getPositionName).collect(Collectors.joining(",")));
|
|
|
+ sysUser.setPositions(StringUtils.join(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getRoleId).collect(Collectors.toSet()),","));
|
|
|
+ sysUser.setPositionName(sysEmployeePositionDtoList.stream().map(SysEmployeePositionDto :: getPositionName).collect(Collectors.joining(",")));
|
|
|
}
|
|
|
- return succeed(employee);
|
|
|
+ return succeed(sysUser);
|
|
|
}
|
|
|
return failed("获取用户信息失败");
|
|
|
}
|