union->concat
This commit is contained in:
@@ -276,14 +276,14 @@ public partial class MareHub
|
|||||||
|
|
||||||
var result = from user in query.Union(query2)
|
var result = from user in query.Union(query2)
|
||||||
join u in _dbContext.Users on user.OtherUserUID equals u.UID
|
join u in _dbContext.Users on user.OtherUserUID equals u.UID
|
||||||
join o in _dbContext.Permissions
|
join o in _dbContext.Permissions.Where(u => u.UserUID == uid)
|
||||||
on new { user.UserUID, user.OtherUserUID }
|
on new { UserUID = user.UserUID, OtherUserUID = user.OtherUserUID }
|
||||||
equals new { o.UserUID, o.OtherUserUID }
|
equals new { UserUID = o.UserUID, OtherUserUID = o.OtherUserUID }
|
||||||
into ownperms
|
into ownperms
|
||||||
from ownperm in ownperms.DefaultIfEmpty()
|
from ownperm in ownperms.DefaultIfEmpty()
|
||||||
join p in _dbContext.Permissions
|
join p in _dbContext.Permissions.Where(u => u.OtherUserUID == uid)
|
||||||
on new { UserUID = user.OtherUserUID, OtherUserUID = user.UserUID }
|
on new { UserUID = user.OtherUserUID, OtherUserUID = user.UserUID }
|
||||||
equals new { p.UserUID, p.OtherUserUID }
|
equals new { UserUID = p.UserUID, OtherUserUID = p.OtherUserUID }
|
||||||
into otherperms
|
into otherperms
|
||||||
from otherperm in otherperms.DefaultIfEmpty()
|
from otherperm in otherperms.DefaultIfEmpty()
|
||||||
select new
|
select new
|
||||||
@@ -314,7 +314,9 @@ public partial class MareHub
|
|||||||
{
|
{
|
||||||
var query = _dbContext.ClientPairs.Where(u => u.UserUID == uid)
|
var query = _dbContext.ClientPairs.Where(u => u.UserUID == uid)
|
||||||
.Join(_dbContext.ClientPairs.Where(u => u.OtherUserUID == uid),
|
.Join(_dbContext.ClientPairs.Where(u => u.OtherUserUID == uid),
|
||||||
user => user.OtherUserUID, user => user.UserUID, (user, otheruser) =>
|
user => user.OtherUserUID,
|
||||||
|
user => user.UserUID,
|
||||||
|
(user, otheruser) =>
|
||||||
new
|
new
|
||||||
{
|
{
|
||||||
UserUID = user.UserUID,
|
UserUID = user.UserUID,
|
||||||
@@ -335,14 +337,14 @@ public partial class MareHub
|
|||||||
Synced = true,
|
Synced = true,
|
||||||
});
|
});
|
||||||
|
|
||||||
var result = from user in query.Union(query2)
|
var result = from user in query.Concat(query2)
|
||||||
join u in _dbContext.Users on user.OtherUserUID equals u.UID
|
join u in _dbContext.Users on user.OtherUserUID equals u.UID
|
||||||
join o in _dbContext.Permissions
|
join o in _dbContext.Permissions.Where(u => u.UserUID == uid)
|
||||||
on new { UserUID = user.UserUID, OtherUserUID = user.OtherUserUID }
|
on new { UserUID = user.UserUID, OtherUserUID = user.OtherUserUID }
|
||||||
equals new { UserUID = o.UserUID, OtherUserUID = o.OtherUserUID }
|
equals new { UserUID = o.UserUID, OtherUserUID = o.OtherUserUID }
|
||||||
into ownperms
|
into ownperms
|
||||||
from ownperm in ownperms.DefaultIfEmpty()
|
from ownperm in ownperms.DefaultIfEmpty()
|
||||||
join p in _dbContext.Permissions
|
join p in _dbContext.Permissions.Where(u => u.OtherUserUID == uid)
|
||||||
on new { UserUID = user.OtherUserUID, OtherUserUID = user.UserUID }
|
on new { UserUID = user.OtherUserUID, OtherUserUID = user.UserUID }
|
||||||
equals new { UserUID = p.UserUID, OtherUserUID = p.OtherUserUID }
|
equals new { UserUID = p.UserUID, OtherUserUID = p.OtherUserUID }
|
||||||
into otherperms
|
into otherperms
|
||||||
|
|||||||
Reference in New Issue
Block a user