|
@@ -16,9 +16,11 @@ using MTWorkHR.Infrastructure.Entities;
|
|
|
using System.Transactions;
|
|
|
using MTWorkHR.Core.Entities.Base;
|
|
|
using System.Threading.Tasks;
|
|
|
+using MTWorkHR.Application.Filters;
|
|
|
|
|
|
namespace MTWorkHR.Application.Services
|
|
|
{
|
|
|
+
|
|
|
public class CompanyService :BaseService<Company, CompanyDto, CompanyDto>, ICompanyService
|
|
|
{
|
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
@@ -40,12 +42,17 @@ namespace MTWorkHR.Application.Services
|
|
|
}
|
|
|
|
|
|
|
|
|
- public override async Task<CompanyDto> GetById(long CompanyId)
|
|
|
+ public async Task<CompanyDto> GetById()
|
|
|
{
|
|
|
- var entity = await _unitOfWork.Company.GetByIdAsync(CompanyId);
|
|
|
- var companyResponse = MapperObject.Mapper.Map<CompanyDto>(entity);
|
|
|
- var userDto = await _userService.GetById(entity.UserId);
|
|
|
- companyResponse.CompanyUser = MapperObject.Mapper.Map<CompanyUserDto>(userDto);
|
|
|
+ var companyResponse = new CompanyDto();
|
|
|
+ if (_globalInfo.CompanyId.HasValue)
|
|
|
+ {
|
|
|
+ var entity = await _unitOfWork.Company.GetByIdAsync(_globalInfo.CompanyId.Value);
|
|
|
+ companyResponse = MapperObject.Mapper.Map<CompanyDto>(entity);
|
|
|
+ var userDto = await _userService.GetById(entity.UserId);
|
|
|
+ companyResponse.CompanyUser = MapperObject.Mapper.Map<CompanyUserDto>(userDto);
|
|
|
+ companyResponse.UserType = companyResponse.CompanyUser.UserType;
|
|
|
+ }
|
|
|
return companyResponse;
|
|
|
}
|
|
|
|