diff --git a/Marco.Pms.Services/Controllers/ServiceProjectController.cs b/Marco.Pms.Services/Controllers/ServiceProjectController.cs index fd62672..b7ce48b 100644 --- a/Marco.Pms.Services/Controllers/ServiceProjectController.cs +++ b/Marco.Pms.Services/Controllers/ServiceProjectController.cs @@ -49,6 +49,7 @@ namespace Marco.Pms.Services.Controllers } + [HttpGet("list")] public async Task GetServiceProjectList([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 20) { @@ -64,8 +65,6 @@ namespace Marco.Pms.Services.Controllers } - - [HttpPut("edit/{id}")] public async Task UpdateProject(Guid id, [FromBody] ServiceProjectDto serviceProject) { @@ -85,11 +84,5 @@ namespace Marco.Pms.Services.Controllers } - - - - - - } } diff --git a/Marco.Pms.Services/Service/ServiceProjectService.cs b/Marco.Pms.Services/Service/ServiceProjectService.cs index 1800fa5..7d64db8 100644 --- a/Marco.Pms.Services/Service/ServiceProjectService.cs +++ b/Marco.Pms.Services/Service/ServiceProjectService.cs @@ -139,7 +139,9 @@ namespace Marco.Pms.Services.Service var serviceProjectIds = serviceProjects.Select(sp => sp.Id).ToList(); var serviceProjectServiceMappings = await _context.ServiceProjectServiceMapping .Include(sps => sps.Service) - .Where(sps => serviceProjectIds.Contains(sps.Id) && sps.Service != null && sps.TenantId == tenantId) + .Where(sps => serviceProjectIds.Contains(sps.ProjectId) && + sps.Service != null && + sps.TenantId == tenantId) .ToListAsync(); var serviceProjectVMs = serviceProjects.Select(sp =>