Fix duplicated user in alarms history

This commit is contained in:
Lucio Maranta
2020-02-25 11:35:44 +01:00
parent 5c6dc352ff
commit e1d6bd1f91
2 changed files with 10 additions and 3 deletions
+7 -2
View File
@@ -166,9 +166,13 @@ namespace Step.Database.Controllers
var tmpUser = dbCtx
.Users
.Where(x => x.Deleted == false) // Get not deleted users
.Join(dbCtx.MachinesUsers,u=>u.UserId,m=>m.UserId, (u, m) => new { Users = u, MachinesUsers = m })
.Join( dbCtx.MachinesUsers,
u => u.UserId,
m => m.UserId,
(u, m) => new { Users = u, MachinesUsers = m }
)
.Where(x => x.MachinesUsers.Role.Level < MIN_CMS_ROLE)
.ToList();
.ToList();
return tmpUser
.Select(x => new DTOMessageUserModel() // Return DTOUserModel
@@ -178,6 +182,7 @@ namespace Step.Database.Controllers
LastName = x.Users.LastName,
Username = x.Users.Username
})
.GroupBy(elem => elem.Id).Select(group => group.First())
.ToList();
}
}