admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Fix/institution-contract/list-search' into Main

Browse Source 
# Conflicts:
#	ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs
This commit is contained in:
mahan
2025-10-14 14:21:58 +03:30
parent 76aa1eae88 f863fb065f
commit be6cb6430f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs
View File

@@ -2367,11 +2367,11 @@ public class InstitutionContractRepository : RepositoryBase<long, InstitutionCon
InstitutionContractSelectListViewModel idSelected = null;
if (string.IsNullOrWhiteSpace(selected))
if (!string.IsNullOrWhiteSpace(selected))
{
idSelected = await res.FirstOrDefaultAsync(x => x.Text == selected);
}
if (string.IsNullOrWhiteSpace(search))
if (!string.IsNullOrWhiteSpace(search))
{
res = res.Where(x => x.Text.Contains(search));
}

1
ServiceHost/Areas/Admin/Controllers/RegistrationWorkflowController.cs
View File

@@ -78,6 +78,7 @@ namespace ServiceHost.Areas.Admin.Controllers
var result = await _employerApplication.EditWorkflowRegistration(command);
return result;
}
[HttpGet("edit-employer/{employerId}/{institutionWorkshopDetailsId}")]
public async Task<ActionResult<EditEmployerWorkflowRegistration>> GetEmployerForEdit(long employerId, long institutionWorkshopDetailsId)
{