This commit is contained in:
mmrbnjd
2024-05-03 18:18:38 +03:30
parent 53df2004a5
commit dd12564a81
10 changed files with 413 additions and 50 deletions

View File

@@ -60,7 +60,15 @@ namespace Back.Controllers
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
item.CompanyID = user.RolUsers.First().CompanyID.ToString();
if (string.IsNullOrEmpty(item.CompanyID))
{
item.CompanyID = user.RolUsers.First().CompanyID.ToString();
}
else
{
if(!await _servCompany.ExsistCompanyByComoanyIDandUserID(Convert.ToInt32(item.CompanyID), Convert.ToInt32(UserID)))
item.CompanyID = user.RolUsers.First().CompanyID.ToString();
}
var res = await _servTicket.NewTicket(item);
return Ok(res != null);
}

View File

@@ -129,7 +129,7 @@ namespace Back.Services
//}
ret.Company = new CompanyAuthenticationDTO
{
ID = user.RolUsers.First().ID,
ID = user.RolUsers.First().CompanyID,
Name = user.RolUsers.First().Company.Name,
IsAdmin = user.RolUsers.First().IsAdmin,
Logo = user.RolUsers.First().Company.Logo == null ? null : Convert.ToBase64String(user.RolUsers.First().Company.Logo)