on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Фиксы

Browse Source
This commit is contained in:
Степанов Дмитрий Александрович 2023-09-27 17:27:20 +05:00
parent 437408d49a
commit 8d051d2089
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudWebApi/Controllers/ProcessMapController.cs
View File

@ -258,6 +258,10 @@ namespace AsbCloudWebApi.Controllers
if (!idUser.HasValue) if (!idUser.HasValue)
return false; return false;
var idCompany = User.GetCompanyId();
if (!idCompany.HasValue || !await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, token))
return false;
var well = await wellService.GetOrDefaultAsync(idWell, token); var well = await wellService.GetOrDefaultAsync(idWell, token);
if (well is null) if (well is null)

2
AsbCloudWebApi/Controllers/ProcessMapWellboreDevelopmentController.cs
View File

@ -87,7 +87,7 @@ public class ProcessMapWellboreDevelopmentController : CrudWellRelatedController
?? throw new ForbidException($"Скважины с {idWell} не существует"); ?? throw new ForbidException($"Скважины с {idWell} не существует");
var idCompany = User.GetCompanyId(); var idCompany = User.GetCompanyId();
if (idCompany is not null && await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, cancellationToken)) if (!idCompany.HasValue || !await wellService.IsCompanyInvolvedInWellAsync(idCompany.Value, idWell, cancellationToken))
throw new ForbidException("Нет доступа к скважине"); throw new ForbidException("Нет доступа к скважине");
if (well.IdState == 2 && !userRepository.HasPermission(idUser, "ProcessMap.editCompletedWell")) if (well.IdState == 2 && !userRepository.HasPermission(idUser, "ProcessMap.editCompletedWell"))

2
AsbCloudWebApi/Controllers/WellOperationController.cs
View File

@ -32,7 +32,7 @@ namespace AsbCloudWebApi.Controllers
private readonly IWellOperationImportService wellOperationImportService; private readonly IWellOperationImportService wellOperationImportService;
private readonly IUserRepository userRepository; private readonly IUserRepository userRepository;
public WellOperationController(IWellOperationRepository operationService, public WellOperationController(IWellOperationRepository operationRepository,
IWellService wellService, IWellService wellService,
IWellOperationImportTemplateService wellOperationImportTemplateService, IWellOperationImportTemplateService wellOperationImportTemplateService,
IWellOperationExportService wellOperationExportService, IWellOperationExportService wellOperationExportService,