Commit0c3b08d

committed

CU-868fwmkkw Fixing issue with disabled/deletes user showing on map.

1 parente2aeecc commit0c3b08dCopy full SHA for 0c3b08d

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ public async Task<DepartmentPlanCount> GetPlanCountsForDepartmentAsync(int depar`
`99`	`99`	`varresponse=awaitclient.ExecuteAsync<GetPlanCountsForDepartmentResult>(request);`
`100`	`100`
`101`	`101`	`if(response.StatusCode==HttpStatusCode.NotFound)`
`102`		`-returnnull;`
	`102`	`+returnnewDepartmentPlanCount();`
`103`	`103`
`104`	`104`	`if(response.Data==null)`
`105`		`-returnnull;`
	`105`	`+returnnewDepartmentPlanCount();`
`106`	`106`
`107`	`107`	`returnresponse.Data.Data;`
`108`	`108`	`}`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()`
`102`	`102`	`varcallTypes=await_callsService.GetCallTypesForDepartmentAsync(DepartmentId);`
`103`	`103`
`104`	`104`	`varpersonnelStates=await_actionLogsService.GetLastActionLogsForDepartmentAsync(DepartmentId);`
`105`		`-varpersonnelNames=await_departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);`
	`105`	`+//var personnelNames = await _departmentsService.GetAllPersonnelNamesForDepartmentAsync(DepartmentId);`
	`106`	`+varpeople=await_usersService.GetUserGroupAndRolesByDepartmentIdAsync(DepartmentId,false,false,false);`
`106`	`107`	`varpersonnelLocations=await_usersService.GetLatestLocationsForDepartmentPersonnelAsync(DepartmentId);`
`107`	`108`
`108`	`109`	`varpersonnelLocationTTL=await_departmentSettingsService.GetMappingPersonnelLocationTTLAsync(DepartmentId);`
`@@ -373,9 +374,9 @@ public async Task<ActionResult<GetMapDataResult>> GetMapDataAndMarkers()`
`373`	`374`	`}`
`374`	`375`	`}`
`375`	`376`
`376`		`-if(personnelNames!=null&&personnelNames.Any())`
	`377`	`+if(people!=null&&people.Any())`
`377`	`378`	`{`
`378`		`-foreach(varpersoninpersonnelNames)`
	`379`	`+foreach(varpersoninpeople)`
`379`	`380`	`{`
`380`	`381`	`if(!await_authorizationService.CanUserViewPersonLocationViaMatrixAsync(person.UserId,UserId,DepartmentId))`
`381`	`382`	`continue;`

Comments

(0)